From 8214cac81b87051a5a63178006e10e2a2662ec97 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Wed, 18 Aug 2004 14:15:21 +0000
Subject: [PATCH] Fix protos from sources

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@166691 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/array/functions/array-keys.xml       |  9 +++++----
 .../functions/call-user-method-array.xml       |  4 ++--
 reference/cpdf/functions/cpdf-open.xml         |  3 ++-
 .../cpdf/functions/cpdf-place-inline-image.xml |  3 ++-
 .../cpdf/functions/cpdf-set-page-animation.xml |  5 ++++-
 reference/cpdf/functions/cpdf-text.xml         |  4 ++--
 reference/cpdf/functions/cpdf-translate.xml    |  3 +--
 .../cyrus/functions/cyrus-authenticate.xml     |  4 +++-
 reference/dbplus/functions/dbplus-rquery.xml   |  4 ++--
 reference/dbplus/functions/dbplus-sql.xml      |  6 +++---
 .../functions/call-user-func-array.xml         |  4 ++--
 reference/gmp/functions/gmp-init.xml           |  5 ++++-
 reference/hw/functions/hw-document-bodytag.xml |  3 ++-
 reference/hw/functions/hw-getobject.xml        |  4 ++--
 reference/hw/functions/hw-identify.xml         |  3 ++-
 reference/hw/functions/hw-insdoc.xml           |  6 +++---
 reference/hw/functions/hw-modifyobject.xml     |  4 ++--
 .../functions/ibase-set-event-handler.xml      | 12 ++++++++++--
 reference/ibase/functions/ibase-wait-event.xml | 10 ++++++++--
 reference/image/functions/imagefilter.xml      | 18 +++++++++++-------
 reference/image/functions/imagepstext.xml      |  8 ++++----
 .../imap/functions/imap-clearflag-full.xml     |  4 ++--
 reference/imap/functions/imap-search.xml       |  4 ++--
 reference/imap/functions/imap-setflag-full.xml |  4 ++--
 reference/imap/functions/imap-undelete.xml     |  3 ++-
 reference/ircg/functions/ircg-html-encode.xml  |  4 +++-
 reference/ircg/functions/ircg-pconnect.xml     |  3 ++-
 reference/ldap/functions/ldap-parse-result.xml |  8 ++++----
 reference/math/functions/max.xml               |  3 +--
 reference/math/functions/min.xml               |  3 +--
 .../mbstring/functions/mb-detect-encoding.xml  |  7 ++++---
 .../functions/mb-ereg-search-setpos.xml        |  4 ++--
 reference/mcal/functions/mcal-close.xml        |  4 ++--
 reference/mcal/functions/mcal-delete-event.xml |  4 ++--
 .../mcal/functions/mcal-event-set-end.xml      | 18 +++++-------------
 .../mcal/functions/mcal-event-set-start.xml    | 17 +++++------------
 reference/mcal/functions/mcal-list-alarms.xml  | 12 ++++++------
 reference/mcal/functions/mcal-list-events.xml  | 10 +++++++---
 reference/mcal/functions/mcal-reopen.xml       |  3 ++-
 reference/misc/functions/get-browser.xml       |  7 ++++++-
 .../muscat/functions/muscat-setup-net.xml      |  3 +--
 reference/oci8/functions/oci-lob-copy.xml      |  4 +++-
 reference/oracle/functions/ora-error.xml       |  4 ++--
 reference/oracle/functions/ora-errorcode.xml   |  4 ++--
 reference/pgsql/functions/pg-fetch-result.xml  |  7 ++++++-
 reference/pgsql/functions/pg-lo-read.xml       |  8 ++++----
 reference/pgsql/functions/pg-lo-write.xml      |  3 ++-
 reference/qtdom/functions/qdom-tree.xml        |  4 ++--
 .../functions/readline-completion-function.xml |  4 ++--
 .../functions/readline-read-history.xml        |  4 ++--
 .../functions/readline-write-history.xml       |  4 ++--
 reference/strings/functions/strtok.xml         | 10 +++++-----
 .../uodbc/functions/odbc-columnprivileges.xml  | 10 +++++-----
 reference/uodbc/functions/odbc-exec.xml        |  3 ++-
 .../uodbc/functions/odbc-procedurecolumns.xml  |  8 ++++----
 reference/uodbc/functions/odbc-procedures.xml  |  6 +++---
 .../uodbc/functions/odbc-tableprivileges.xml   |  8 ++++----
 .../vpopmail/functions/vpopmail-passwd.xml     |  3 ++-
 reference/xmlrpc/functions/xmlrpc-is-fault.xml |  4 ++--
 reference/xslt/functions/xslt-set-log.xml      |  4 ++--
 reference/yaz/functions/yaz-set-option.xml     |  7 ++++++-
 61 files changed, 199 insertions(+), 157 deletions(-)

diff --git a/reference/array/functions/array-keys.xml b/reference/array/functions/array-keys.xml
index ce1052814f..56db3937cd 100644
--- a/reference/array/functions/array-keys.xml
+++ b/reference/array/functions/array-keys.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-keys">
    <refnamediv>
@@ -11,9 +11,8 @@
      <methodsynopsis>
       <type>array</type><methodname>array_keys</methodname>
       <methodparam><type>array</type><parameter>input</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>
-        search_value
-       </parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter>search_value</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>strict</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>array_keys</function> returns the keys, numeric and
@@ -23,6 +22,8 @@
      If the optional <parameter>search_value</parameter> is specified,
      then only the keys for that value are returned. Otherwise, all
      the keys from the <parameter>input</parameter> are returned.
+     As of PHP 5, you can use <parameter>strict</parameter> parameter for
+     comparison including type (===).
     </para>
     <para>
      <example>
diff --git a/reference/classobj/functions/call-user-method-array.xml b/reference/classobj/functions/call-user-method-array.xml
index f6c0db7560..42535acea0 100644
--- a/reference/classobj/functions/call-user-method-array.xml
+++ b/reference/classobj/functions/call-user-method-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/classobj.xml, last change in rev 1.36 -->
   <refentry id="function.call-user-method-array">
    <refnamediv>
@@ -14,7 +14,7 @@
       <type>mixed</type><methodname>call_user_method_array</methodname>
       <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
       <methodparam><type>object</type><parameter>&amp;obj</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>paramarr</parameter></methodparam>
+      <methodparam><type>array</type><parameter>paramarr</parameter></methodparam>
      </methodsynopsis>
     <warning>
      <para>
diff --git a/reference/cpdf/functions/cpdf-open.xml b/reference/cpdf/functions/cpdf-open.xml
index 9b45de537c..bdf91ecee5 100644
--- a/reference/cpdf/functions/cpdf-open.xml
+++ b/reference/cpdf/functions/cpdf-open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.22 -->
   <refentry id="function.cpdf-open">
    <refnamediv>
@@ -12,6 +12,7 @@
       <type>int</type><methodname>cpdf_open</methodname>
       <methodparam><type>int</type><parameter>compression</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter>doc_limits</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_open</function> function opens
diff --git a/reference/cpdf/functions/cpdf-place-inline-image.xml b/reference/cpdf/functions/cpdf-place-inline-image.xml
index 2df6402c76..ca2c1b826e 100644
--- a/reference/cpdf/functions/cpdf-place-inline-image.xml
+++ b/reference/cpdf/functions/cpdf-place-inline-image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-place-inline-image">
    <refnamediv>
@@ -17,6 +17,7 @@
       <methodparam><type>float</type><parameter>angle</parameter></methodparam>
       <methodparam><type>float</type><parameter>width</parameter></methodparam>
       <methodparam><type>float</type><parameter>height</parameter></methodparam>
+      <methodparam><type>int</type><parameter>gsave</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/cpdf/functions/cpdf-set-page-animation.xml b/reference/cpdf/functions/cpdf-set-page-animation.xml
index a8d08dafd0..930ec65520 100644
--- a/reference/cpdf/functions/cpdf-set-page-animation.xml
+++ b/reference/cpdf/functions/cpdf-set-page-animation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-set-page-animation">
    <refnamediv>
@@ -13,6 +13,9 @@
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>int</type><parameter>transition</parameter></methodparam>
       <methodparam><type>float</type><parameter>duration</parameter></methodparam>
+      <methodparam><type>float</type><parameter>direction</parameter></methodparam>
+      <methodparam><type>int</type><parameter>orientation</parameter></methodparam>
+      <methodparam><type>int</type><parameter>inout</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_set_page_animation</function> function set the
diff --git a/reference/cpdf/functions/cpdf-text.xml b/reference/cpdf/functions/cpdf-text.xml
index 10711c2c77..e3a1e7ecb6 100644
--- a/reference/cpdf/functions/cpdf-text.xml
+++ b/reference/cpdf/functions/cpdf-text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-text">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>bool</type><methodname>cpdf_text</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>string</type><parameter>text</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
+      <methodparam choice="opt"><type>float</type><parameter>x-coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
       <methodparam choice="opt"><type>float</type><parameter>orientation</parameter></methodparam>
diff --git a/reference/cpdf/functions/cpdf-translate.xml b/reference/cpdf/functions/cpdf-translate.xml
index e48cae51c7..086157bc93 100644
--- a/reference/cpdf/functions/cpdf-translate.xml
+++ b/reference/cpdf/functions/cpdf-translate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.35 -->
   <refentry id="function.cpdf-translate">
    <refnamediv>
@@ -13,7 +13,6 @@
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_translate</function> function set the origin of
diff --git a/reference/cyrus/functions/cyrus-authenticate.xml b/reference/cyrus/functions/cyrus-authenticate.xml
index 849723bde9..e13be77362 100644
--- a/reference/cyrus/functions/cyrus-authenticate.xml
+++ b/reference/cyrus/functions/cyrus-authenticate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/cyrus.xml, last change in rev 1.1 -->
   <refentry id="function.cyrus-authenticate">
    <refnamediv>
@@ -16,6 +16,8 @@
      <methodparam choice="opt"><type>string</type><parameter>user</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>minssf</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>maxssf</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter>authname</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
      </methodsynopsis>
     <para>
      &warn.undocumented.func; 
diff --git a/reference/dbplus/functions/dbplus-rquery.xml b/reference/dbplus/functions/dbplus-rquery.xml
index ca9a225ce9..6bbbc0cd21 100644
--- a/reference/dbplus/functions/dbplus-rquery.xml
+++ b/reference/dbplus/functions/dbplus-rquery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-rquery">
    <refnamediv>
@@ -11,7 +11,7 @@
     <methodsynopsis>
      <type>int</type><methodname>dbplus_rquery</methodname>
      <methodparam><type>string</type><parameter>query</parameter></methodparam>
-     <methodparam><type>string</type><parameter>dbpath</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter>dbpath</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/dbplus/functions/dbplus-sql.xml b/reference/dbplus/functions/dbplus-sql.xml
index b1b3634e24..a217d93869 100644
--- a/reference/dbplus/functions/dbplus-sql.xml
+++ b/reference/dbplus/functions/dbplus-sql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/dbplus.xml, last change in rev 1.1 -->
   <refentry id="function.dbplus-sql">
    <refnamediv>
@@ -11,8 +11,8 @@
     <methodsynopsis>
      <type>resource</type><methodname>dbplus_sql</methodname>
      <methodparam><type>string</type><parameter>query</parameter></methodparam>
-     <methodparam><type>string</type><parameter>server</parameter></methodparam>
-     <methodparam><type>string</type><parameter>dbpath</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter>server</parameter></methodparam>
+     <methodparam choice="opt"><type>string</type><parameter>dbpath</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/funchand/functions/call-user-func-array.xml b/reference/funchand/functions/call-user-func-array.xml
index 287d905e3b..8e5c2ecbae 100644
--- a/reference/funchand/functions/call-user-func-array.xml
+++ b/reference/funchand/functions/call-user-func-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/funchand.xml, last change in rev 1.10 -->
   <refentry id="function.call-user-func-array">
    <refnamediv>
@@ -13,7 +13,7 @@
      <methodsynopsis>
       <type>mixed</type><methodname>call_user_func_array</methodname>
       <methodparam><type>callback</type><parameter>function</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>param_arr</parameter></methodparam>
+      <methodparam><type>array</type><parameter>param_arr</parameter></methodparam>
      </methodsynopsis>
     <para>
      Call a user defined function given by
diff --git a/reference/gmp/functions/gmp-init.xml b/reference/gmp/functions/gmp-init.xml
index a0b556880b..4bf3c70c7c 100644
--- a/reference/gmp/functions/gmp-init.xml
+++ b/reference/gmp/functions/gmp-init.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/gmp.xml, last change in rev 1.1 -->
   <refentry id="function.gmp-init">
    <refnamediv>
@@ -11,11 +11,14 @@
      <methodsynopsis>
       <type>resource</type><methodname>gmp_init</methodname>
       <methodparam><type>mixed</type><parameter>number</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>base</parameter></methodparam>
      </methodsynopsis>
     <para>
      Creates a GMP number from an integer or string. String
      representation can be decimal or hexadecimal. In the latter case,
      the string should start with <literal>0x</literal>.
+     Optional parameter <parameter>base</parameter> is available since
+     PHP 4.1.0.
     </para>
     <para>
      <example>
diff --git a/reference/hw/functions/hw-document-bodytag.xml b/reference/hw/functions/hw-document-bodytag.xml
index 5aa009346a..398d9a99d9 100644
--- a/reference/hw/functions/hw-document-bodytag.xml
+++ b/reference/hw/functions/hw-document-bodytag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/hw.xml, last change in rev 1.2 -->
   <refentry id="function.hw-document-bodytag">
    <refnamediv>
@@ -11,6 +11,7 @@
      <methodsynopsis>
       <type>string</type><methodname>hw_document_bodytag</methodname>
       <methodparam><type>int</type><parameter>hw_document</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>prefix</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the BODY tag of the document. If the document is an HTML
diff --git a/reference/hw/functions/hw-getobject.xml b/reference/hw/functions/hw-getobject.xml
index 635a2dd653..7d765adc11 100644
--- a/reference/hw/functions/hw-getobject.xml
+++ b/reference/hw/functions/hw-getobject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/hw.xml, last change in rev 1.2 -->
   <refentry id="function.hw-getobject">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>array</type><methodname>hw_getobject</methodname>
       <methodparam><type>int</type><parameter>connection</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>objectID</parameter></methodparam>
-      <methodparam><type>string</type><parameter>query</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>query</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the object record for the object with ID
diff --git a/reference/hw/functions/hw-identify.xml b/reference/hw/functions/hw-identify.xml
index 10208379ee..f1efaada58 100644
--- a/reference/hw/functions/hw-identify.xml
+++ b/reference/hw/functions/hw-identify.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/hw.xml, last change in rev 1.2 -->
   <refentry id="function.hw-identify">
    <refnamediv>
@@ -10,6 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>hw_identify</methodname>
+      <methodparam><type>int</type><parameter>link</parameter></methodparam>
       <methodparam><type>string</type><parameter>username</parameter></methodparam>
       <methodparam><type>string</type><parameter>password</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/hw/functions/hw-insdoc.xml b/reference/hw/functions/hw-insdoc.xml
index aec4d8dd87..c45a5f1397 100644
--- a/reference/hw/functions/hw-insdoc.xml
+++ b/reference/hw/functions/hw-insdoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/hw.xml, last change in rev 1.2 -->
   <refentry id="function.hw-insdoc">
    <refnamediv>
@@ -10,10 +10,10 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>hw_insdoc</methodname>
-      <methodparam><type>int</type><parameter>connection</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
       <methodparam><type>int</type><parameter>parentID</parameter></methodparam>
       <methodparam><type>string</type><parameter>object_record</parameter></methodparam>
-      <methodparam><type>string</type><parameter>text</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>text</parameter></methodparam>
      </methodsynopsis>
     <para>
      Inserts a new document with attributes as in
diff --git a/reference/hw/functions/hw-modifyobject.xml b/reference/hw/functions/hw-modifyobject.xml
index e8e8f71f63..ea87fff272 100644
--- a/reference/hw/functions/hw-modifyobject.xml
+++ b/reference/hw/functions/hw-modifyobject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hw.xml, last change in rev 1.2 -->
   <refentry id="function.hw-modifyobject">
    <refnamediv>
@@ -14,7 +14,7 @@
       <methodparam><type>int</type><parameter>object_to_change</parameter></methodparam>
       <methodparam><type>array</type><parameter>remove</parameter></methodparam>
       <methodparam><type>array</type><parameter>add</parameter></methodparam>
-      <methodparam><type>int</type><parameter>mode</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      This command allows to remove, add, or modify individual attributes
diff --git a/reference/ibase/functions/ibase-set-event-handler.xml b/reference/ibase/functions/ibase-set-event-handler.xml
index 009c37c2c2..53a4b51d3e 100644
--- a/reference/ibase/functions/ibase-set-event-handler.xml
+++ b/reference/ibase/functions/ibase-set-event-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.ibase-set-event-handler">
    <refnamediv>
     <refname>ibase_set_event_handler</refname>
@@ -11,7 +11,14 @@
     <title>Description</title>
      <methodsynopsis>
       <type>resource</type><methodname>ibase_set_event_handler</methodname>
-      <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
+      <methodparam><type>callback</type><parameter>event_handler</parameter></methodparam>
+      <methodparam><type>string</type><parameter>event_name1</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>event_name2</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>...</parameter></methodparam>
+     </methodsynopsis>
+     <methodsynopsis>
+      <type>resource</type><methodname>ibase_set_event_handler</methodname>
+      <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
       <methodparam><type>callback</type><parameter>event_handler</parameter></methodparam>
       <methodparam><type>string</type><parameter>event_name1</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>event_name2</parameter></methodparam>
@@ -22,6 +29,7 @@
      events. The callback is called with the event name and the link resource as arguments
      whenever one of the specified events is posted by the database. The callback must
      return &false; if the event handler should be canceled. Any other return value is ignored.
+     This function accepts up to 15 event arguments.
     </para>
     <para>
      <informalexample>
diff --git a/reference/ibase/functions/ibase-wait-event.xml b/reference/ibase/functions/ibase-wait-event.xml
index ce8e5331e5..309f68d10b 100644
--- a/reference/ibase/functions/ibase-wait-event.xml
+++ b/reference/ibase/functions/ibase-wait-event.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.ibase-wait-event">
    <refnamediv>
     <refname>ibase_wait_event</refname>
@@ -11,7 +11,13 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>ibase_wait_event</methodname>
-      <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
+      <methodparam><type>string</type><parameter>event_name1</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>event_name2</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>...</parameter></methodparam>
+     </methodsynopsis>
+     <methodsynopsis>
+      <type>string</type><methodname>ibase_wait_event</methodname>
+      <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
       <methodparam><type>string</type><parameter>event_name1</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>event_name2</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>...</parameter></methodparam>
diff --git a/reference/image/functions/imagefilter.xml b/reference/image/functions/imagefilter.xml
index 0a949d3a83..406ac872fc 100644
--- a/reference/image/functions/imagefilter.xml
+++ b/reference/image/functions/imagefilter.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.imagefilter">
    <refnamediv>
     <refname>imagefilter</refname>
@@ -13,12 +13,15 @@
      <type>bool</type><methodname>imagefilter</methodname>
      <methodparam><type>resource</type><parameter>src_im</parameter></methodparam>
      <methodparam><type>int</type><parameter>filtertype</parameter></methodparam>
-      <methodparam  choice="opt"><type>int</type><parameter>args</parameter></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter>arg1</parameter></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter>arg2</parameter></methodparam>
+     <methodparam choice="opt"><type>int</type><parameter>arg3</parameter></methodparam>
     </methodsynopsis>
     <para>
      <function>imagefilter</function> applies the filter
      <parameter>filtertype</parameter> to the image, using
-     <parameter>args</parameter> where necessary.
+     <parameter>arg1</parameter>, <parameter>arg2</parameter> and
+     <parameter>arg3</parameter> where necessary.
     </para>
     <para>
      <parameter>filtertype</parameter> can be one of the following:
@@ -38,14 +41,14 @@
       <listitem>
        <simpara>
         <parameter>IMG_FILTER_BRIGHTNESS</parameter>: Changes the brightness
-        of the image. Use <parameter>args</parameter> to set the level of
+        of the image. Use <parameter>arg1</parameter> to set the level of
         brightness.
        </simpara>
       </listitem>
       <listitem>
        <simpara>
         <parameter>IMG_FILTER_CONTRAST</parameter>: Changes the contrast of
-        the image. Use <parameter>args</parameter> to set the level of
+        the image. Use <parameter>arg1</parameter> to set the level of
         contrast.
        </simpara>
       </listitem>
@@ -53,7 +56,8 @@
        <simpara>
         <parameter>IMG_FILTER_COLORIZE</parameter>: Like
         <parameter>IMG_FILTER_GRAYSCALE</parameter>, except you can specify the
-        color. Use 3 separate <parameter>args</parameter>, in the form of
+        color. Use <parameter>arg1</parameter>, <parameter>arg2</parameter> and
+        <parameter>arg3</parameter> in the form of
         <parameter>red</parameter>, <parameter>blue</parameter>,
         <parameter>green</parameter>. The range for each color is 0 to 255.
        </simpara>
@@ -89,7 +93,7 @@
       <listitem>
        <simpara>
         <parameter>IMG_FILTER_SMOOTH</parameter>: Makes the image smoother.
-        Use <parameter>args</parameter> to set the level of smoothness.
+        Use <parameter>arg1</parameter> to set the level of smoothness.
        </simpara>
       </listitem>
      </itemizedlist>
diff --git a/reference/image/functions/imagepstext.xml b/reference/image/functions/imagepstext.xml
index b5c6251582..cac000f5d5 100644
--- a/reference/image/functions/imagepstext.xml
+++ b/reference/image/functions/imagepstext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.2 -->
   <refentry id="function.imagepstext">
    <refnamediv>
@@ -19,9 +19,9 @@
       <methodparam><type>int</type><parameter>x</parameter></methodparam>
       <methodparam><type>int</type><parameter>y</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>space</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>tightness</parameter></methodparam>
-      <methodparam choice="opt"><type>float</type><parameter>angle</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>antialias_steps</parameter></methodparam>
+      <methodparam><type>int</type><parameter>tightness</parameter></methodparam>
+      <methodparam><type>float</type><parameter>angle</parameter></methodparam>
+      <methodparam><type>int</type><parameter>antialias_steps</parameter></methodparam>
      </methodsynopsis>
     <para>
      <parameter>foreground</parameter> is the color in which the text
diff --git a/reference/imap/functions/imap-clearflag-full.xml b/reference/imap/functions/imap-clearflag-full.xml
index c71a85176a..a03ad095d2 100644
--- a/reference/imap/functions/imap-clearflag-full.xml
+++ b/reference/imap/functions/imap-clearflag-full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/imap.xml, last change in rev 1.33 -->
   <refentry id="function.imap-clearflag-full">
    <refnamediv>
@@ -13,7 +13,7 @@
       <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
       <methodparam><type>string</type><parameter>sequence</parameter></methodparam>
       <methodparam><type>string</type><parameter>flag</parameter></methodparam>
-      <methodparam><type>string</type><parameter>options</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>options</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function causes a store to delete the specified 
diff --git a/reference/imap/functions/imap-search.xml b/reference/imap/functions/imap-search.xml
index 816eb6d808..9c1283f58a 100644
--- a/reference/imap/functions/imap-search.xml
+++ b/reference/imap/functions/imap-search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/imap.xml, last change in rev 1.2 -->
   <refentry id="function.imap-search">
    <refnamediv>
@@ -15,7 +15,7 @@
       <type>array</type><methodname>imap_search</methodname>
       <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
       <methodparam><type>string</type><parameter>criteria</parameter></methodparam>
-      <methodparam><type>int</type><parameter>options</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/imap/functions/imap-setflag-full.xml b/reference/imap/functions/imap-setflag-full.xml
index affe44e0dd..4115d06275 100644
--- a/reference/imap/functions/imap-setflag-full.xml
+++ b/reference/imap/functions/imap-setflag-full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/imap.xml, last change in rev 1.2 -->
   <refentry id="function.imap-setflag-full">
    <refnamediv>
@@ -13,7 +13,7 @@
       <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
       <methodparam><type>string</type><parameter>sequence</parameter></methodparam>
       <methodparam><type>string</type><parameter>flag</parameter></methodparam>
-      <methodparam><type>string</type><parameter>options</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>options</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function causes a store to add the specified 
diff --git a/reference/imap/functions/imap-undelete.xml b/reference/imap/functions/imap-undelete.xml
index 91dcd05623..48ba0821bf 100644
--- a/reference/imap/functions/imap-undelete.xml
+++ b/reference/imap/functions/imap-undelete.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/imap.xml, last change in rev 1.9 -->
   <refentry id="function.imap-undelete">
    <refnamediv>
@@ -14,6 +14,7 @@
       <type>bool</type><methodname>imap_undelete</methodname>
       <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>msg_number</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
      </methodsynopsis>
     <para> 
      This function removes the deletion flag for a specified message,
diff --git a/reference/ircg/functions/ircg-html-encode.xml b/reference/ircg/functions/ircg-html-encode.xml
index 6692a3066f..31a9855a25 100644
--- a/reference/ircg/functions/ircg-html-encode.xml
+++ b/reference/ircg/functions/ircg-html-encode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/ircg.xml, last change in rev 1.1 -->
   <refentry id="function.ircg-html-encode">
    <refnamediv>
@@ -13,6 +13,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>ircg_html_encode</methodname>
       <methodparam><type>string</type><parameter>html_string</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>auto_links</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>conv_br</parameter></methodparam>
      </methodsynopsis>
     <para>
      Encodes a HTML string <parameter>html_string</parameter> for
diff --git a/reference/ircg/functions/ircg-pconnect.xml b/reference/ircg/functions/ircg-pconnect.xml
index 3da853bd32..8767c8daa1 100644
--- a/reference/ircg/functions/ircg-pconnect.xml
+++ b/reference/ircg/functions/ircg-pconnect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/ircg.xml, last change in rev 1.1 -->
   <refentry id="function.ircg-pconnect">
    <refnamediv>
@@ -18,6 +18,7 @@
       <methodparam choice="opt"><type>string</type><parameter>msg_format</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>ctcp_messages</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>user_settings</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>bailout_on_trivial</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>ircg_pconnect</function> will try to establish a
diff --git a/reference/ldap/functions/ldap-parse-result.xml b/reference/ldap/functions/ldap-parse-result.xml
index 8a6c5e16e2..0e99a681c1 100644
--- a/reference/ldap/functions/ldap-parse-result.xml
+++ b/reference/ldap/functions/ldap-parse-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.39 -->
   <refentry id='function.ldap-parse-result'>
    <refnamediv>
@@ -15,9 +15,9 @@
       <methodparam><type>resource</type><parameter>link</parameter></methodparam>
       <methodparam><type>resource</type><parameter>result</parameter></methodparam>
       <methodparam><type>int</type><parameter>&amp;errcode</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;matcheddn</parameter></methodparam>
-      <methodparam><type>string</type><parameter>&amp;errmsg</parameter></methodparam>
-      <methodparam><type>array</type><parameter>&amp;referrals</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>&amp;matcheddn</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>&amp;errmsg</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter>&amp;referrals</parameter></methodparam>
      </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/math/functions/max.xml b/reference/math/functions/max.xml
index 9c4960ae6e..ff5d60c91c 100644
--- a/reference/math/functions/max.xml
+++ b/reference/math/functions/max.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/math.xml, last change in rev 1.2 -->
   <refentry id="function.max">
    <refnamediv>
@@ -17,7 +17,6 @@
     <methodsynopsis>
      <type>mixed</type><methodname>max</methodname>
      <methodparam><type>array</type><parameter>numbers</parameter></methodparam>
-     <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam>
     </methodsynopsis>
     <para>
      <function>max</function> returns the numerically highest of the
diff --git a/reference/math/functions/min.xml b/reference/math/functions/min.xml
index 17852fa143..8e9d32f03c 100644
--- a/reference/math/functions/min.xml
+++ b/reference/math/functions/min.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/math.xml, last change in rev 1.2 -->
   <refentry id="function.min">
    <refnamediv>
@@ -17,7 +17,6 @@
      <methodsynopsis>
       <type>mixed</type><methodname>min</methodname>
       <methodparam><type>array</type><parameter>numbers</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>min</function> returns the numerically lowest of the
diff --git a/reference/mbstring/functions/mb-detect-encoding.xml b/reference/mbstring/functions/mb-detect-encoding.xml
index 34b18b55aa..c129c1d68a 100644
--- a/reference/mbstring/functions/mb-detect-encoding.xml
+++ b/reference/mbstring/functions/mb-detect-encoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.1 -->
   <refentry id="function.mb-detect-encoding">
    <refnamediv>
@@ -11,7 +11,8 @@
      <methodsynopsis>
       <type>string</type><methodname>mb_detect_encoding</methodname>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>encoding-list</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter>encoding_list</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>strict</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mb_detect_encoding</function> detects character
@@ -19,7 +20,7 @@
      detected character encoding.
     </para>
     <para>
-     <parameter>encoding-list</parameter> is list of character
+     <parameter>encoding_list</parameter> is list of character
      encoding. Encoding order may be specified by array or comma
      separated list string.
     </para>
diff --git a/reference/mbstring/functions/mb-ereg-search-setpos.xml b/reference/mbstring/functions/mb-ereg-search-setpos.xml
index f4fc04ea3d..080bd3f533 100644
--- a/reference/mbstring/functions/mb-ereg-search-setpos.xml
+++ b/reference/mbstring/functions/mb-ereg-search-setpos.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.23 -->
   <refentry id="function.mb-ereg-search-setpos">
    <refnamediv>
@@ -12,7 +12,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>array</type><methodname>mb_ereg_search_setpos</methodname>
-     <void/>
+     <methodparam><type>int</type><parameter>position</parameter></methodparam>
     </methodsynopsis>
      &warn.experimental.func;
     <simpara>
diff --git a/reference/mcal/functions/mcal-close.xml b/reference/mcal/functions/mcal-close.xml
index 84ad16d4b8..dccf86728c 100644
--- a/reference/mcal/functions/mcal-close.xml
+++ b/reference/mcal/functions/mcal-close.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.11 -->
   <refentry id="function.mcal-close">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>int</type><methodname>mcal_close</methodname>
       <methodparam><type>int</type><parameter>mcal_stream</parameter></methodparam>
-      <methodparam><type>int</type><parameter>flags</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
      </methodsynopsis>
     <para> 
      Closes the given mcal stream.
diff --git a/reference/mcal/functions/mcal-delete-event.xml b/reference/mcal/functions/mcal-delete-event.xml
index 2c7f65b843..b0f548d69a 100644
--- a/reference/mcal/functions/mcal-delete-event.xml
+++ b/reference/mcal/functions/mcal-delete-event.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.2 -->
   <refentry id="function.mcal-delete-event">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>int</type><methodname>mcal_delete_event</methodname>
       <methodparam><type>int</type><parameter>mcal_stream</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>event_id</parameter></methodparam>
+      <methodparam><type>int</type><parameter>event_id</parameter></methodparam>
      </methodsynopsis>
     <para>  
      <function>mcal_delete_event</function> deletes the calendar event
diff --git a/reference/mcal/functions/mcal-event-set-end.xml b/reference/mcal/functions/mcal-event-set-end.xml
index a2dbf8a5d1..e5f765cf26 100644
--- a/reference/mcal/functions/mcal-event-set-end.xml
+++ b/reference/mcal/functions/mcal-event-set-end.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.2 -->
   <refentry id="function.mcal-event-set-end">
    <refnamediv>
@@ -15,18 +15,10 @@
       <methodparam><type>int</type><parameter>stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>year</parameter></methodparam>
       <methodparam><type>int</type><parameter>month</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        day
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        hour
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        min
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        sec
-       </parameter></methodparam>
+      <methodparam><type>int</type><parameter>day</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>hour</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>min</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>sec</parameter></methodparam>
      </methodsynopsis>
     <para>  
      <function>mcal_event_set_end</function> sets the streams global
diff --git a/reference/mcal/functions/mcal-event-set-start.xml b/reference/mcal/functions/mcal-event-set-start.xml
index f665a6b61d..89b21a9727 100644
--- a/reference/mcal/functions/mcal-event-set-start.xml
+++ b/reference/mcal/functions/mcal-event-set-start.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.2 -->
   <refentry id="function.mcal-event-set-start">
    <refnamediv>
@@ -16,17 +16,10 @@
       <methodparam><type>int</type><parameter>stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>year</parameter></methodparam>
       <methodparam><type>int</type><parameter>month</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        day
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        hour
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        min</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>
-        sec
-       </parameter></methodparam>
+      <methodparam><type>int</type><parameter>day</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>hour</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>min</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>sec</parameter></methodparam>
      </methodsynopsis>
     <para>  
      <function>mcal_event_set_start</function> sets the streams global
diff --git a/reference/mcal/functions/mcal-list-alarms.xml b/reference/mcal/functions/mcal-list-alarms.xml
index 0d519ffead..9419cb9de5 100644
--- a/reference/mcal/functions/mcal-list-alarms.xml
+++ b/reference/mcal/functions/mcal-list-alarms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.2 -->
   <refentry id="function.mcal-list-alarms">
    <refnamediv>
@@ -15,11 +15,11 @@
       <type>array</type><methodname>mcal_list_alarms</methodname>
       <methodparam><type>int</type><parameter>mcal_stream</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>begin_year</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>begin_month</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>begin_day</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>end_year</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>end_month</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>end_day</parameter></methodparam>
+      <methodparam><type>int</type><parameter>begin_month</parameter></methodparam>
+      <methodparam><type>int</type><parameter>begin_day</parameter></methodparam>
+      <methodparam><type>int</type><parameter>end_year</parameter></methodparam>
+      <methodparam><type>int</type><parameter>end_month</parameter></methodparam>
+      <methodparam><type>int</type><parameter>end_day</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns an array of event ID's that has an alarm going off
diff --git a/reference/mcal/functions/mcal-list-events.xml b/reference/mcal/functions/mcal-list-events.xml
index 225f6d9041..f8113aa9b5 100644
--- a/reference/mcal/functions/mcal-list-events.xml
+++ b/reference/mcal/functions/mcal-list-events.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.2 -->
   <refentry id="function.mcal-list-events">
    <refnamediv>
@@ -13,8 +13,12 @@
      <methodsynopsis>
       <type>array</type><methodname>mcal_list_events</methodname>
       <methodparam><type>int</type><parameter>mcal_stream</parameter></methodparam>
-      <methodparam><type>object</type><parameter>begin_date</parameter></methodparam>
-      <methodparam choice="opt"><type>object</type><parameter>end_date</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>begin_year</parameter></methodparam>
+      <methodparam><type>int</type><parameter>begin_month</parameter></methodparam>
+      <methodparam><type>int</type><parameter>begin_day</parameter></methodparam>
+      <methodparam><type>int</type><parameter>end_year</parameter></methodparam>
+      <methodparam><type>int</type><parameter>end_month</parameter></methodparam>
+      <methodparam><type>int</type><parameter>end_day</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns an array of ID's that are between the start and end
diff --git a/reference/mcal/functions/mcal-reopen.xml b/reference/mcal/functions/mcal-reopen.xml
index a56b97dae6..22123dc491 100644
--- a/reference/mcal/functions/mcal-reopen.xml
+++ b/reference/mcal/functions/mcal-reopen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mcal.xml, last change in rev 1.11 -->
   <refentry id="function.mcal-reopen">
    <refnamediv>
@@ -10,6 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>mcal_reopen</methodname>
+      <methodparam><type>int</type><parameter>mcal_stream</parameter></methodparam>
       <methodparam><type>string</type><parameter>calendar</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/misc/functions/get-browser.xml b/reference/misc/functions/get-browser.xml
index c5b4847dbf..5486ac47a1 100644
--- a/reference/misc/functions/get-browser.xml
+++ b/reference/misc/functions/get-browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
   <refentry id="function.get-browser">
    <refnamediv>
@@ -13,6 +13,7 @@
      <methodsynopsis>
       <type>object</type><methodname>get_browser</methodname>
       <methodparam choice="opt"><type>string</type><parameter>user_agent</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>return_array</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      <function>get_browser</function> attempts to determine the
@@ -30,6 +31,10 @@
      major and minor version numbers and ID string; &true;/&false; values
      for features such as frames, JavaScript, and cookies; and so
      forth.
+     As of PHP 4.3.2, if the optional parameter
+     <parameter>return_array</parameter> is &true;, this function will return
+     <type>array</type> instead of <type>object</type>. You can bypass
+     <parameter>user_agent</parameter> parameter with &null; value.
     </simpara>
     <simpara>
      While <filename>browscap.ini</filename> contains information on
diff --git a/reference/muscat/functions/muscat-setup-net.xml b/reference/muscat/functions/muscat-setup-net.xml
index 2b71de2bbf..02ed0714da 100644
--- a/reference/muscat/functions/muscat-setup-net.xml
+++ b/reference/muscat/functions/muscat-setup-net.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/muscat.xml, last change in rev 1.1 -->
   <refentry id="function.muscat-setup-net">
    <refnamediv>
@@ -11,7 +11,6 @@
      <methodsynopsis>
       <type>resource</type><methodname>muscat_setup_net</methodname>
       <methodparam><type>string</type><parameter>muscat_host</parameter></methodparam>
-      <methodparam><type>int</type><parameter>port</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/oci8/functions/oci-lob-copy.xml b/reference/oci8/functions/oci-lob-copy.xml
index d8b643b601..29ad808fb0 100644
--- a/reference/oci8/functions/oci-lob-copy.xml
+++ b/reference/oci8/functions/oci-lob-copy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.oci-lob-copy">
    <refnamediv>
     <refname>oci_lob_copy</refname>
@@ -9,6 +9,8 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>oci_lob_copy</methodname>
+      <methodparam><type>object</type><parameter>lob_to</parameter></methodparam>
+      <methodparam><type>object</type><parameter>lob_from</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/oracle/functions/ora-error.xml b/reference/oracle/functions/ora-error.xml
index f99d0b1f6b..54f70cb188 100644
--- a/reference/oracle/functions/ora-error.xml
+++ b/reference/oracle/functions/ora-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/oracle.xml, last change in rev 1.2 -->
   <refentry id="function.ora-error">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>ora_error</methodname>
-      <methodparam><type>resource</type><parameter>cursor_or_connection</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>cursor_or_connection</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns an error message of the form
diff --git a/reference/oracle/functions/ora-errorcode.xml b/reference/oracle/functions/ora-errorcode.xml
index 78f691ae7b..5a730a1435 100644
--- a/reference/oracle/functions/ora-errorcode.xml
+++ b/reference/oracle/functions/ora-errorcode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/oracle.xml, last change in rev 1.2 -->
   <refentry id="function.ora-errorcode">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>ora_errorcode</methodname>
-      <methodparam><type>resource</type><parameter>cursor_or_connection</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>cursor_or_connection</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the numeric error code of the last executed statement on
diff --git a/reference/pgsql/functions/pg-fetch-result.xml b/reference/pgsql/functions/pg-fetch-result.xml
index 5254de07c1..3e1afef82e 100644
--- a/reference/pgsql/functions/pg-fetch-result.xml
+++ b/reference/pgsql/functions/pg-fetch-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.82 -->
   <refentry id="function.pg-fetch-result">
    <refnamediv>
@@ -14,6 +14,11 @@
       <methodparam><type>int</type><parameter>row</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
      </methodsynopsis>
+     <methodsynopsis>
+      <type>mixed</type><methodname>pg_fetch_result</methodname>
+      <methodparam><type>resource</type><parameter>result</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+     </methodsynopsis>
     <para>
      <function>pg_fetch_result</function> returns values from a
      <parameter>result</parameter> resource returned by
diff --git a/reference/pgsql/functions/pg-lo-read.xml b/reference/pgsql/functions/pg-lo-read.xml
index d306c2a4fb..f7f4a99847 100644
--- a/reference/pgsql/functions/pg-lo-read.xml
+++ b/reference/pgsql/functions/pg-lo-read.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.74 -->
   <refentry id="function.pg-lo-read">
    <refnamediv>
@@ -11,12 +11,12 @@
      <methodsynopsis>
       <type>string</type><methodname>pg_lo_read</methodname>
       <methodparam><type>resource</type><parameter>large_object</parameter></methodparam>
-      <methodparam><type>int</type><parameter>len</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>len</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>pg_lo_read</function> reads at most
-     <parameter>len</parameter> bytes from a large object and returns
-     it as a string.  <parameter>large_object</parameter> specifies a
+     <parameter>len</parameter> (defaults to 8192) bytes from a large object and
+     returns it as a string.  <parameter>large_object</parameter> specifies a
      valid large object resource and<parameter>len</parameter>
      specifies the maximum allowable size of the large object
      segment. It returns &false; if there is an error.
diff --git a/reference/pgsql/functions/pg-lo-write.xml b/reference/pgsql/functions/pg-lo-write.xml
index 5105fd6ca7..96628f1326 100644
--- a/reference/pgsql/functions/pg-lo-write.xml
+++ b/reference/pgsql/functions/pg-lo-write.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.2 -->
   <refentry id="function.pg-lo-write">
    <refnamediv>
@@ -12,6 +12,7 @@
       <type>int</type><methodname>pg_lo_write</methodname>
       <methodparam><type>resource</type><parameter>large_object</parameter></methodparam>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>len</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>pg_lo_write</function> writes at most to a large object
diff --git a/reference/qtdom/functions/qdom-tree.xml b/reference/qtdom/functions/qdom-tree.xml
index db61e70374..5ba978a104 100644
--- a/reference/qtdom/functions/qdom-tree.xml
+++ b/reference/qtdom/functions/qdom-tree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/qtdom.xml, last change in rev 1.1 -->
   <refentry id="function.qdom-tree">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>object</type><methodname>qdom_tree</methodname>
-      <methodparam><type>string</type><parameter/></methodparam>
+      <methodparam><type>string</type><parameter>doc</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/readline/functions/readline-completion-function.xml b/reference/readline/functions/readline-completion-function.xml
index 7e60ecef9a..9a67fb0058 100644
--- a/reference/readline/functions/readline-completion-function.xml
+++ b/reference/readline/functions/readline-completion-function.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/readline.xml, last change in rev 1.1 -->
   <refentry id="function.readline-completion-function">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>readline_completion_function</methodname>
-      <methodparam><type>string</type><parameter>line</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>line</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function registers a completion function.  You must supply
diff --git a/reference/readline/functions/readline-read-history.xml b/reference/readline/functions/readline-read-history.xml
index 5e2d8c747e..67d1dfcac1 100644
--- a/reference/readline/functions/readline-read-history.xml
+++ b/reference/readline/functions/readline-read-history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/readline.xml, last change in rev 1.1 -->
   <refentry id="function.readline-read-history">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>readline_read_history</methodname>
-      <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function reads a command history from a file.
diff --git a/reference/readline/functions/readline-write-history.xml b/reference/readline/functions/readline-write-history.xml
index ac548a3e77..fdd84de3c4 100644
--- a/reference/readline/functions/readline-write-history.xml
+++ b/reference/readline/functions/readline-write-history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/readline.xml, last change in rev 1.1 -->
   <refentry id="function.readline-write-history">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>readline_write_history</methodname>
-      <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function writes the command history to a file.
diff --git a/reference/strings/functions/strtok.xml b/reference/strings/functions/strtok.xml
index cd677a1b4c..dcfe7b3118 100644
--- a/reference/strings/functions/strtok.xml
+++ b/reference/strings/functions/strtok.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.strtok">
    <refnamediv>
@@ -10,13 +10,13 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>strtok</methodname>
-      <methodparam><type>string</type><parameter>arg1</parameter></methodparam>
-      <methodparam><type>string</type><parameter>arg2</parameter></methodparam>
+      <methodparam><type>string</type><parameter>str</parameter></methodparam>
+      <methodparam><type>string</type><parameter>token</parameter></methodparam>
      </methodsynopsis>
     <para>
-     <function>strtok</function> splits a string (<parameter>arg1</parameter>)
+     <function>strtok</function> splits a string (<parameter>str</parameter>)
      into smaller strings (tokens), with each token being delimited by any 
-     character from <parameter>arg2</parameter>.
+     character from <parameter>token</parameter>.
      That is, if you have a string like "This is an example string" you
      could tokenize this string into its individual words by using the
      space character as the token.
diff --git a/reference/uodbc/functions/odbc-columnprivileges.xml b/reference/uodbc/functions/odbc-columnprivileges.xml
index d173d13816..26567a5e7d 100644
--- a/reference/uodbc/functions/odbc-columnprivileges.xml
+++ b/reference/uodbc/functions/odbc-columnprivileges.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.3 -->
   <refentry id="function.odbc-columnprivileges">
    <refnamediv>
@@ -14,10 +14,10 @@
      <methodsynopsis>
       <type>int</type><methodname>odbc_columnprivileges</methodname>
       <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>owner</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>table_name</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>column_name</parameter></methodparam>
+      <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
+      <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+      <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
+      <methodparam><type>string</type><parameter>column_name</parameter></methodparam>
      </methodsynopsis>
     <para>
      Lists columns and associated privileges for the given table.
diff --git a/reference/uodbc/functions/odbc-exec.xml b/reference/uodbc/functions/odbc-exec.xml
index 0c4bdefbb1..cf23baf552 100644
--- a/reference/uodbc/functions/odbc-exec.xml
+++ b/reference/uodbc/functions/odbc-exec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.2 -->
   <refentry id="function.odbc-exec">
    <refnamediv>
@@ -12,6 +12,7 @@
       <type>resource</type><methodname>odbc_exec</methodname>
       <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
       <methodparam><type>string</type><parameter>query_string</parameter></methodparam>
+      <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns &false; on error.  Returns an ODBC
diff --git a/reference/uodbc/functions/odbc-procedurecolumns.xml b/reference/uodbc/functions/odbc-procedurecolumns.xml
index 0773837609..bcc78b899c 100644
--- a/reference/uodbc/functions/odbc-procedurecolumns.xml
+++ b/reference/uodbc/functions/odbc-procedurecolumns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.3 -->
   <refentry id="function.odbc-procedurecolumns">
    <refnamediv>
@@ -14,9 +14,9 @@
       <type>resource</type><methodname>odbc_procedurecolumns</methodname>
       <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>owner</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>proc</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>column</parameter></methodparam>
+      <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+      <methodparam><type>string</type><parameter>proc</parameter></methodparam>
+      <methodparam><type>string</type><parameter>column</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the list of input and output parameters, as well as the 
diff --git a/reference/uodbc/functions/odbc-procedures.xml b/reference/uodbc/functions/odbc-procedures.xml
index 8ba7741167..c971221346 100644
--- a/reference/uodbc/functions/odbc-procedures.xml
+++ b/reference/uodbc/functions/odbc-procedures.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.3 -->
   <refentry id="function.odbc-procedures">
    <refnamediv>
@@ -15,8 +15,8 @@
       <type>resource</type><methodname>odbc_procedures</methodname>
       <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>owner</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+      <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+      <methodparam><type>string</type><parameter>name</parameter></methodparam>
      </methodsynopsis>
     <para> 
      Lists all procedures in the requested range.  Returns an ODBC
diff --git a/reference/uodbc/functions/odbc-tableprivileges.xml b/reference/uodbc/functions/odbc-tableprivileges.xml
index 62fabf723a..15e5178ac1 100644
--- a/reference/uodbc/functions/odbc-tableprivileges.xml
+++ b/reference/uodbc/functions/odbc-tableprivileges.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.3 -->
   <refentry id="function.odbc-tableprivileges">
    <refnamediv>
@@ -13,9 +13,9 @@
      <methodsynopsis>
       <type>int</type><methodname>odbc_tableprivileges</methodname>
       <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>owner</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+      <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
+      <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+      <methodparam><type>string</type><parameter>name</parameter></methodparam>
      </methodsynopsis>
     <para>
      Lists tables in the requested range and the privileges associated
diff --git a/reference/vpopmail/functions/vpopmail-passwd.xml b/reference/vpopmail/functions/vpopmail-passwd.xml
index 0b529924c1..9f05c79a55 100644
--- a/reference/vpopmail/functions/vpopmail-passwd.xml
+++ b/reference/vpopmail/functions/vpopmail-passwd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
   <refentry id="function.vpopmail-passwd">
    <refnamediv>
@@ -13,6 +13,7 @@
       <methodparam><type>string</type><parameter>user</parameter></methodparam>
       <methodparam><type>string</type><parameter>domain</parameter></methodparam>
       <methodparam><type>string</type><parameter>password</parameter></methodparam>
+      <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/xmlrpc/functions/xmlrpc-is-fault.xml b/reference/xmlrpc/functions/xmlrpc-is-fault.xml
index d2f15dffe8..33d9100f50 100644
--- a/reference/xmlrpc/functions/xmlrpc-is-fault.xml
+++ b/reference/xmlrpc/functions/xmlrpc-is-fault.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.xmlrpc-is-fault">
    <refnamediv>
     <refname>xmlrpc_is_fault</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>bool</type><methodname>xmlrpc_is_fault</methodname>
-     <void/>
+     <methodparam><type>array</type><parameter>arg</parameter></methodparam>
     </methodsynopsis>
      &warn.experimental.func;
     <para>
diff --git a/reference/xslt/functions/xslt-set-log.xml b/reference/xslt/functions/xslt-set-log.xml
index 7f688dc1ef..a921339b86 100644
--- a/reference/xslt/functions/xslt-set-log.xml
+++ b/reference/xslt/functions/xslt-set-log.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/xslt.xml, last change in rev 1.3 -->
   <refentry id="function.xslt-set-log">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>void</type><methodname>xslt_set_log</methodname>
       <methodparam><type>resource</type><parameter>xh</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>log</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter>log</parameter></methodparam>
      </methodsynopsis>
     <para>
      <variablelist>
diff --git a/reference/yaz/functions/yaz-set-option.xml b/reference/yaz/functions/yaz-set-option.xml
index 79e2ecb4b1..d8a3454912 100644
--- a/reference/yaz/functions/yaz-set-option.xml
+++ b/reference/yaz/functions/yaz-set-option.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.yaz-set-option">
    <refnamediv>
     <refname>yaz_set_option</refname>
@@ -13,6 +13,11 @@
       <methodparam><type>string</type><parameter>name</parameter></methodparam>
       <methodparam><type>string</type><parameter>value</parameter></methodparam>
      </methodsynopsis>
+     <methodsynopsis>
+      <type>string</type><methodname>yaz_set_option</methodname>
+      <methodparam><type>resource</type><parameter>id</parameter></methodparam>
+      <methodparam><type>array</type><parameter>options</parameter></methodparam>
+     </methodsynopsis>
     <para>
      Sets option <parameter>name</parameter> to <parameter>value</parameter>.
     </para>