diff --git a/reference/bc/functions/bccomp.xml b/reference/bc/functions/bccomp.xml
index 356a3728c4..9e13b3865e 100644
--- a/reference/bc/functions/bccomp.xml
+++ b/reference/bc/functions/bccomp.xml
@@ -12,7 +12,7 @@
    <type>int</type><methodname>bccomp</methodname>
    <methodparam><type>string</type><parameter>left_operand</parameter></methodparam>
    <methodparam><type>string</type><parameter>right_operand</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>scale</parameter><initializer>ini_get("bcmath.scale")</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>scale</parameter></methodparam>
   </methodsynopsis>
   <para>
    Compares the <parameter>left_operand</parameter> to the
diff --git a/reference/com/functions/com-load-typelib.xml b/reference/com/functions/com-load-typelib.xml
index 7567556186..304d3e318c 100644
--- a/reference/com/functions/com-load-typelib.xml
+++ b/reference/com/functions/com-load-typelib.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>com_load_typelib</methodname>
    <methodparam><type>string</type><parameter>typelib_name</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>case_insensitive</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>case_insensitive</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Loads a type-library and registers its constants in the engine, as though
diff --git a/reference/com/functions/com-message-pump.xml b/reference/com/functions/com-message-pump.xml
index 51f36c3ffe..4ce02bef58 100644
--- a/reference/com/functions/com-message-pump.xml
+++ b/reference/com/functions/com-message-pump.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>com_message_pump</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>timeoutms</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>timeoutms</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This function will sleep for up to <parameter>timeoutms</parameter>
diff --git a/reference/com/functions/com-print-typeinfo.xml b/reference/com/functions/com-print-typeinfo.xml
index 09b664aa25..4506aa5251 100644
--- a/reference/com/functions/com-print-typeinfo.xml
+++ b/reference/com/functions/com-print-typeinfo.xml
@@ -11,7 +11,7 @@
    <type>bool</type><methodname>com_print_typeinfo</methodname>
    <methodparam><type>object</type><parameter>comobject</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>dispinterface</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>wantsink</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>wantsink</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    The purpose of this function is to help generate a skeleton class for use
diff --git a/reference/dom/domxpath/evaluate.xml b/reference/dom/domxpath/evaluate.xml
index 786cdc36b3..036cc30320 100644
--- a/reference/dom/domxpath/evaluate.xml
+++ b/reference/dom/domxpath/evaluate.xml
@@ -13,7 +13,7 @@
    <type>mixed</type><methodname>DOMXPath::evaluate</methodname>
    <methodparam><type>string</type><parameter>expression</parameter></methodparam>
    <methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>
-   <methodparam choice="opt"><type>boolean</type><parameter>registerNodeNS</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>registerNodeNS</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Executes the given XPath <parameter>expression</parameter> and returns
diff --git a/reference/dom/domxpath/query.xml b/reference/dom/domxpath/query.xml
index ab4e199f8f..cbc3d762a4 100644
--- a/reference/dom/domxpath/query.xml
+++ b/reference/dom/domxpath/query.xml
@@ -13,7 +13,7 @@
    <type>DOMNodeList</type><methodname>DOMXPath::query</methodname>
    <methodparam><type>string</type><parameter>expression</parameter></methodparam>
    <methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>
-   <methodparam choice="opt"><type>boolean</type><parameter>registerNodeNS</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>registerNodeNS</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Executes the given XPath <parameter>expression</parameter>.
diff --git a/reference/iconv/functions/iconv-substr.xml b/reference/iconv/functions/iconv-substr.xml
index 5d2c77fdb7..3ab2d93a95 100644
--- a/reference/iconv/functions/iconv-substr.xml
+++ b/reference/iconv/functions/iconv-substr.xml
@@ -12,7 +12,7 @@
    <type>string</type><methodname>iconv_substr</methodname>
    <methodparam><type>string</type><parameter>str</parameter></methodparam>
    <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>strlen($str)</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>iconv_strlen($str, $charset)</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>charset</parameter><initializer>ini_get("iconv.internal_encoding")</initializer></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/imap/functions/imap-gc.xml b/reference/imap/functions/imap-gc.xml
index 3248316763..550ddf1996 100644
--- a/reference/imap/functions/imap-gc.xml
+++ b/reference/imap/functions/imap-gc.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>imap_gc</methodname>
+   <type>bool</type><methodname>imap_gc</methodname>
    <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
    <methodparam><type>int</type><parameter>caches</parameter></methodparam>
   </methodsynopsis>
@@ -39,7 +39,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true;.
+  &return.success;
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/libxml/functions/libxml-disable-entity-loader.xml b/reference/libxml/functions/libxml-disable-entity-loader.xml
index 008d23850b..0d5ff11736 100644
--- a/reference/libxml/functions/libxml-disable-entity-loader.xml
+++ b/reference/libxml/functions/libxml-disable-entity-loader.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>ReturnType</type><methodname>libxml_disable_entity_loader</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>disable</parameter> <initializer>TRUE</initializer></methodparam>
+   <type>bool</type><methodname>libxml_disable_entity_loader</methodname>
+   <methodparam choice="opt"><type>bool</type><parameter>disable</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Disable/enable the ability to load external entities.
diff --git a/reference/mssql/functions/mssql-connect.xml b/reference/mssql/functions/mssql-connect.xml
index e342ff3dda..c508eac026 100644
--- a/reference/mssql/functions/mssql-connect.xml
+++ b/reference/mssql/functions/mssql-connect.xml
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>string</type><parameter>servername</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>bool</type><parameter>new_link</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>mssql_connect</function> establishes a connection to a
diff --git a/reference/mssql/functions/mssql-pconnect.xml b/reference/mssql/functions/mssql-pconnect.xml
index 8e53c6785f..ccac3d027b 100644
--- a/reference/mssql/functions/mssql-pconnect.xml
+++ b/reference/mssql/functions/mssql-pconnect.xml
@@ -13,7 +13,7 @@
    <methodparam choice="opt"><type>string</type><parameter>servername</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>bool</type><parameter>new_link</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>mssql_pconnect</function> acts very much like
diff --git a/reference/openssl/functions/openssl-decrypt.xml b/reference/openssl/functions/openssl-decrypt.xml
index f45fcc9d0a..2107d30af9 100644
--- a/reference/openssl/functions/openssl-decrypt.xml
+++ b/reference/openssl/functions/openssl-decrypt.xml
@@ -14,7 +14,8 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam><type>string</type><parameter>method</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>raw_input</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>raw_input</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
    Takes a raw or base64 encoded string and decrypts it using a given method and key.
diff --git a/reference/openssl/functions/openssl-encrypt.xml b/reference/openssl/functions/openssl-encrypt.xml
index 7a1aee8e72..34f5aa81c0 100644
--- a/reference/openssl/functions/openssl-encrypt.xml
+++ b/reference/openssl/functions/openssl-encrypt.xml
@@ -15,6 +15,7 @@
    <methodparam><type>string</type><parameter>method</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>raw_output</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
    Encrypts given data with given method and key, returns a raw
diff --git a/reference/openssl/functions/openssl-open.xml b/reference/openssl/functions/openssl-open.xml
index 4cb792ea50..1d42e9d7fa 100644
--- a/reference/openssl/functions/openssl-open.xml
+++ b/reference/openssl/functions/openssl-open.xml
@@ -14,6 +14,7 @@
    <methodparam><type>string</type><parameter role="reference">open_data</parameter></methodparam>
    <methodparam><type>string</type><parameter>env_key</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>priv_key_id</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>method</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>openssl_open</function> opens (decrypts)
diff --git a/reference/openssl/functions/openssl-random-pseudo-bytes.xml b/reference/openssl/functions/openssl-random-pseudo-bytes.xml
index 9fbedbb472..c4102d6c36 100644
--- a/reference/openssl/functions/openssl-random-pseudo-bytes.xml
+++ b/reference/openssl/functions/openssl-random-pseudo-bytes.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>openssl_random_pseudo_bytes</methodname>
-   <methodparam><type>string</type><parameter>length</parameter></methodparam>
+   <methodparam><type>int</type><parameter>length</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter role="reference">crypto_strong</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/openssl/functions/openssl-seal.xml b/reference/openssl/functions/openssl-seal.xml
index 7a42a9b66f..7119c2f2e7 100644
--- a/reference/openssl/functions/openssl-seal.xml
+++ b/reference/openssl/functions/openssl-seal.xml
@@ -14,6 +14,7 @@
    <methodparam><type>string</type><parameter role="reference">sealed_data</parameter></methodparam>
    <methodparam><type>array</type><parameter role="reference">env_keys</parameter></methodparam>
    <methodparam><type>array</type><parameter>pub_key_ids</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>method</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>openssl_seal</function> seals (encrypts)
diff --git a/reference/pcre/functions/preg-match-all.xml b/reference/pcre/functions/preg-match-all.xml
index 64f1568127..89f97a5449 100644
--- a/reference/pcre/functions/preg-match-all.xml
+++ b/reference/pcre/functions/preg-match-all.xml
@@ -197,6 +197,12 @@ echo $out[1][0] . ", " . $out[1][1] . "\n";
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>5.4.0</entry>
+       <entry>
+        The <parameter>matches</parameter> parameter became optional.
+       </entry>
+      </row>
       <row>
        <entry>5.2.2</entry>
        <entry>
diff --git a/reference/reflection/reflection/export.xml b/reference/reflection/reflection/export.xml
index f53876d6a2..37e0f4aab1 100644
--- a/reference/reflection/reflection/export.xml
+++ b/reference/reflection/reflection/export.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Reflection::export</methodname>
    <methodparam><type>Reflector</type><parameter>reflector</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>return</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    Exports a reflection.
diff --git a/reference/regex/functions/split.xml b/reference/regex/functions/split.xml
index 7fcecb5a30..006f6ee904 100644
--- a/reference/regex/functions/split.xml
+++ b/reference/regex/functions/split.xml
@@ -12,7 +12,7 @@
    <type>array</type><methodname>split</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
    Splits a <parameter>string</parameter> into array by regular expression.
diff --git a/reference/regex/functions/spliti.xml b/reference/regex/functions/spliti.xml
index 6de2a08cf3..fdc06490e2 100644
--- a/reference/regex/functions/spliti.xml
+++ b/reference/regex/functions/spliti.xml
@@ -12,7 +12,7 @@
    <type>array</type><methodname>spliti</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
   <para>
    Splits a <parameter>string</parameter> into array by regular expression.
diff --git a/reference/simplexml/simplexmlelement/count.xml b/reference/simplexml/simplexmlelement/count.xml
index 92f508ba8b..ba871a043a 100644
--- a/reference/simplexml/simplexmlelement/count.xml
+++ b/reference/simplexml/simplexmlelement/count.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>SimpleXMLElement::count</methodname>
+   <modifier>public</modifier> <type>int</type><methodname>SimpleXMLElement::count</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/snmp/functions/snmp-set-enum-print.xml b/reference/snmp/functions/snmp-set-enum-print.xml
index ad7c1212bf..ea7629bf62 100644
--- a/reference/snmp/functions/snmp-set-enum-print.xml
+++ b/reference/snmp/functions/snmp-set-enum-print.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>void</type><methodname>snmp_set_enum_print</methodname>
+   <type>bool</type><methodname>snmp_set_enum_print</methodname>
    <methodparam><type>int</type><parameter>enum_print</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/snmp/functions/snmp-set-oid-output-format.xml b/reference/snmp/functions/snmp-set-oid-output-format.xml
index 6260ce168b..53181ba292 100644
--- a/reference/snmp/functions/snmp-set-oid-output-format.xml
+++ b/reference/snmp/functions/snmp-set-oid-output-format.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>void</type><methodname>snmp_set_oid_output_format</methodname>
+   <type>bool</type><methodname>snmp_set_oid_output_format</methodname>
    <methodparam><type>int</type><parameter>oid_format</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/snmp/functions/snmp-set-quick-print.xml b/reference/snmp/functions/snmp-set-quick-print.xml
index 68e17a12b7..b8fea06a62 100644
--- a/reference/snmp/functions/snmp-set-quick-print.xml
+++ b/reference/snmp/functions/snmp-set-quick-print.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>void</type><methodname>snmp_set_quick_print</methodname>
+   <type>bool</type><methodname>snmp_set_quick_print</methodname>
    <methodparam><type>bool</type><parameter>quick_print</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/snmp/functions/snmp-set-valueretrieval.xml b/reference/snmp/functions/snmp-set-valueretrieval.xml
index 725d60db7a..86084428b5 100644
--- a/reference/snmp/functions/snmp-set-valueretrieval.xml
+++ b/reference/snmp/functions/snmp-set-valueretrieval.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>void</type><methodname>snmp_set_valueretrieval</methodname>
+   <type>bool</type><methodname>snmp_set_valueretrieval</methodname>
    <methodparam><type>int</type><parameter>method</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/soap/functions/use-soap-error-handler.xml b/reference/soap/functions/use-soap-error-handler.xml
index bdc35f2418..c8c92275bc 100644
--- a/reference/soap/functions/use-soap-error-handler.xml
+++ b/reference/soap/functions/use-soap-error-handler.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>use_soap_error_handler</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>handler</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>handler</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    This function sets whether or not to use the SOAP error handler in the SOAP server. 
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   Returns the original value.
   </para>
  </refsect1>
 
diff --git a/reference/soap/soapheader/soapheader.xml b/reference/soap/soapheader/soapheader.xml
index 2e92a6b639..1acf71b9dd 100644
--- a/reference/soap/soapheader/soapheader.xml
+++ b/reference/soap/soapheader/soapheader.xml
@@ -14,7 +14,7 @@
    <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam choice="opt"><type>mixed</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>mustunderstand</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>mustunderstand</parameter><initializer>false</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>actor</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/soap/soapserver/setpersistence.xml b/reference/soap/soapserver/setpersistence.xml
index a798c33dec..eed2a45884 100644
--- a/reference/soap/soapserver/setpersistence.xml
+++ b/reference/soap/soapserver/setpersistence.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::setPersistence</methodname>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
+   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function allows saving data between requests in a PHP session. It works only
diff --git a/reference/spl/globiterator/construct.xml b/reference/spl/globiterator/construct.xml
index 2238f99c22..87edaa52d4 100644
--- a/reference/spl/globiterator/construct.xml
+++ b/reference/spl/globiterator/construct.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <methodname>GlobIterator::__construct</methodname>
    <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>flags</parameter><initializer>FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO</initializer></methodparam>
   </methodsynopsis>
   <para>
    Constructs a new directory iterator from a glob expression.
diff --git a/reference/spl/globiterator/count.xml b/reference/spl/globiterator/count.xml
index 0cd9203c41..754b28ae50 100644
--- a/reference/spl/globiterator/count.xml
+++ b/reference/spl/globiterator/count.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>GlobIterator::count</methodname>
+   <modifier>public</modifier> <type>int</type><methodname>GlobIterator::count</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/spl/multipleiterator/construct.xml b/reference/spl/multipleiterator/construct.xml
index 3082e3b7c5..fa3eda6766 100644
--- a/reference/spl/multipleiterator/construct.xml
+++ b/reference/spl/multipleiterator/construct.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <methodname>MultipleIterator::__construct</methodname>
-   <methodparam><type>integer</type><parameter>flags</parameter></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
   <para>
    Construct a new MultipleIterator.
diff --git a/reference/spl/multipleiterator/setflags.xml b/reference/spl/multipleiterator/setflags.xml
index 77f1dc9c4b..7343a4b72a 100644
--- a/reference/spl/multipleiterator/setflags.xml
+++ b/reference/spl/multipleiterator/setflags.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>void</type><methodname>MultipleIterator::setFlags</methodname>
-   <methodparam><type>integer</type><parameter>flags</parameter></methodparam>
+   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets flags.
diff --git a/reference/spl/splfileobject/eof.xml b/reference/spl/splfileobject/eof.xml
index 753a7d2d63..3dcd80f2be 100644
--- a/reference/spl/splfileobject/eof.xml
+++ b/reference/spl/splfileobject/eof.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>SplFileObject::eof</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SplFileObject::eof</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/spl/splfileobject/fflush.xml b/reference/spl/splfileobject/fflush.xml
index 7be3be61f5..306ff4e2b3 100644
--- a/reference/spl/splfileobject/fflush.xml
+++ b/reference/spl/splfileobject/fflush.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>SplFileObject::fflush</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SplFileObject::fflush</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/spl/splfixedarray/fromarray.xml b/reference/spl/splfixedarray/fromarray.xml
index 2509c40f45..86cd87f0de 100644
--- a/reference/spl/splfixedarray/fromarray.xml
+++ b/reference/spl/splfixedarray/fromarray.xml
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>SplFixedArray</type><methodname>SplFixedArray::fromArray</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam choice="opt"><type>boolean</type><parameter>save_indexes</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>save_indexes</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Import the PHP array <parameter>array</parameter> 
diff --git a/reference/spl/splobjectstorage/contains.xml b/reference/spl/splobjectstorage/contains.xml
index e6c7736b37..3e93387cf3 100644
--- a/reference/spl/splobjectstorage/contains.xml
+++ b/reference/spl/splobjectstorage/contains.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>SplObjectStorage::contains</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SplObjectStorage::contains</methodname>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/spl/splobjectstorage/offsetexists.xml b/reference/spl/splobjectstorage/offsetexists.xml
index b910e85622..6ec5b7a487 100644
--- a/reference/spl/splobjectstorage/offsetexists.xml
+++ b/reference/spl/splobjectstorage/offsetexists.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>SplObjectStorage::offsetExists</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SplObjectStorage::offsetExists</methodname>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/spl/splobjectstorage/valid.xml b/reference/spl/splobjectstorage/valid.xml
index e1bcfa1fa1..1429b37a76 100644
--- a/reference/spl/splobjectstorage/valid.xml
+++ b/reference/spl/splobjectstorage/valid.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>SplObjectStorage::valid</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SplObjectStorage::valid</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/spl/spltempfileobject/construct.xml b/reference/spl/spltempfileobject/construct.xml
index fa7cecd565..f480215e1d 100644
--- a/reference/spl/spltempfileobject/construct.xml
+++ b/reference/spl/spltempfileobject/construct.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <methodname>SplTempFileObject::__construct</methodname>
-   <methodparam choice="opt"><type>integer</type><parameter>max_memory</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>max_memory</parameter></methodparam>
   </methodsynopsis>
   <para>
    Construct a new temporary file object.
diff --git a/reference/sqlite3/sqlite3/busyTimeout.xml b/reference/sqlite3/sqlite3/busyTimeout.xml
index 3fc2652b3c..4960688689 100644
--- a/reference/sqlite3/sqlite3/busyTimeout.xml
+++ b/reference/sqlite3/sqlite3/busyTimeout.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>SQLite3::busyTimeout</methodname>
-   <methodparam><type>integer</type><parameter>msecs</parameter></methodparam>
+   <methodparam><type>int</type><parameter>msecs</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets a busy handler that will sleep until the database is not locked or the timeout is reached.
diff --git a/reference/v8js/v8jsexception/getjsfilename.xml b/reference/v8js/v8jsexception/getjsfilename.xml
index 1523402ba5..d5926ad3b1 100644
--- a/reference/v8js/v8jsexception/getjsfilename.xml
+++ b/reference/v8js/v8jsexception/getjsfilename.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>V8JsException::getJsFileName</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>V8JsException::getJsFileName</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/v8js/v8jsexception/getjslinenumber.xml b/reference/v8js/v8jsexception/getjslinenumber.xml
index 22904730cd..172fd7d3d8 100644
--- a/reference/v8js/v8jsexception/getjslinenumber.xml
+++ b/reference/v8js/v8jsexception/getjslinenumber.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>V8JsException::getJsLineNumber</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>V8JsException::getJsLineNumber</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/v8js/v8jsexception/getjssourceline.xml b/reference/v8js/v8jsexception/getjssourceline.xml
index e8f989bcb9..9bdb2d8589 100644
--- a/reference/v8js/v8jsexception/getjssourceline.xml
+++ b/reference/v8js/v8jsexception/getjssourceline.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>V8JsException::getJsSourceLine</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>V8JsException::getJsSourceLine</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/v8js/v8jsexception/getjstrace.xml b/reference/v8js/v8jsexception/getjstrace.xml
index c6214de0d8..dc3489a545 100644
--- a/reference/v8js/v8jsexception/getjstrace.xml
+++ b/reference/v8js/v8jsexception/getjstrace.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>V8JsException::getJsTrace</methodname>
+   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>V8JsException::getJsTrace</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/xmlreader/xmlreader/expand.xml b/reference/xmlreader/xmlreader/expand.xml
index 2183fd4c33..56fdaaacd4 100644
--- a/reference/xmlreader/xmlreader/expand.xml
+++ b/reference/xmlreader/xmlreader/expand.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <type>DOMNode</type>
    <methodname>XMLReader::expand</methodname>
-   <void/>
+   <methodparam choice="opt"><type>DOMNode</type><parameter>basenode</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method copies the current node and returns the appropriate DOM object.