diff --git a/language-snippets.ent b/language-snippets.ent
index 8ed9a07303d6..0d96c58f19fc 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1357,7 +1357,7 @@ string</link>, or a Connect Name from
 the <filename>tnsnames.ora</filename> file, or the name of a local
 Oracle instance.
 </para>
-<para xmlns='http://docbook.org/ns/docbook'>If not specified, PHP uses
+<para xmlns='http://docbook.org/ns/docbook'>If not specified or &null;, PHP uses
 environment variables such as <constant>TWO_TASK</constant> (on Linux)
 or <constant>LOCAL</constant> (on Windows)
 and <constant>ORACLE_SID</constant> to determine the
diff --git a/reference/oci8/OCI-Collection/append.xml b/reference/oci8/OCI-Collection/append.xml
index e74cb8eca427..33450779e5ee 100644
--- a/reference/oci8/OCI-Collection/append.xml
+++ b/reference/oci8/OCI-Collection/append.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCICollection::append</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>OCICollection::append</methodname>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    Appends element to the end of the collection.
@@ -25,7 +25,7 @@
      <term><parameter>value</parameter></term>
      <listitem>
       <para>
-       The value to be added to the collection. Can be a string or a number.
+       The value to be added to the collection.
       </para>
      </listitem>
     </varlistentry>
@@ -67,13 +67,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.assign" /></member>
+    <member><xref linkend="oci-collection.assign"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Collection/assign.xml b/reference/oci8/OCI-Collection/assign.xml
index 720b52d19d50..6d9eac3f43b3 100644
--- a/reference/oci8/OCI-Collection/assign.xml
+++ b/reference/oci8/OCI-Collection/assign.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCICollection::assign</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCICollection::assign</methodname>
    <methodparam><type>OCICollection</type><parameter>from</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -69,13 +69,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.append" /></member>
+    <member><xref linkend="oci-collection.append"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Collection/assignElem.xml b/reference/oci8/OCI-Collection/assignElem.xml
index c29d0ebfc514..c8fa8294495a 100644
--- a/reference/oci8/OCI-Collection/assignElem.xml
+++ b/reference/oci8/OCI-Collection/assignElem.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCICollection::assignElem</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCICollection::assignElem</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    Assigns a value to the element with index <parameter>index</parameter>.
@@ -76,13 +76,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.getelem" /></member>
+    <member><xref linkend="oci-collection.getelem"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Collection/free.xml b/reference/oci8/OCI-Collection/free.xml
index 00aa46bea95c..68cda3ff0852 100644
--- a/reference/oci8/OCI-Collection/free.xml
+++ b/reference/oci8/OCI-Collection/free.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCICollection::free</methodname>
-   <void />
+   <modifier>public</modifier> <type>bool</type><methodname>OCICollection::free</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Frees the resources associated with the collection object. 
@@ -56,13 +56,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.oci-new-collection" /></member>
+    <member><xref linkend="function.oci-new-collection"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -83,4 +82,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Collection/getElem.xml b/reference/oci8/OCI-Collection/getElem.xml
index b2d3672c1a2e..51749bfbf15d 100644
--- a/reference/oci8/OCI-Collection/getElem.xml
+++ b/reference/oci8/OCI-Collection/getElem.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>mixed</type><methodname>OCICollection::getElem</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>float</type><type>null</type><type>false</type></type><methodname>OCICollection::getElem</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -69,13 +69,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.assignelem" /></member>
+    <member><xref linkend="oci-collection.assignelem"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -96,4 +95,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Collection/max.xml b/reference/oci8/OCI-Collection/max.xml
index 72b42560bd2d..726e84a3190b 100644
--- a/reference/oci8/OCI-Collection/max.xml
+++ b/reference/oci8/OCI-Collection/max.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>int</type><methodname>OCICollection::max</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>OCICollection::max</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Returns the maximum number of elements in the collection.
@@ -59,13 +59,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.size" /></member>
+    <member><xref linkend="oci-collection.size"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Collection/size.xml b/reference/oci8/OCI-Collection/size.xml
index 3ec591888982..ab75a8938b4e 100644
--- a/reference/oci8/OCI-Collection/size.xml
+++ b/reference/oci8/OCI-Collection/size.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>int</type><methodname>OCICollection::size</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>OCICollection::size</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Returns the size of the collection.
@@ -56,13 +56,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.max" /></member>
+    <member><xref linkend="oci-collection.max"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Collection/trim.xml b/reference/oci8/OCI-Collection/trim.xml
index edae8ddd20d2..baf7881c34d9 100644
--- a/reference/oci8/OCI-Collection/trim.xml
+++ b/reference/oci8/OCI-Collection/trim.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCICollection::trim</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCICollection::trim</methodname>
    <methodparam><type>int</type><parameter>num</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -68,13 +68,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.size" /></member>
+    <member><xref linkend="oci-collection.size"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/append.xml b/reference/oci8/OCI-Lob/append.xml
index 352275789661..2ab4737cc53d 100644
--- a/reference/oci8/OCI-Lob/append.xml
+++ b/reference/oci8/OCI-Lob/append.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::append</methodname>
-   <methodparam><type>OCILob</type><parameter>lob_from</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::append</methodname>
+   <methodparam><type>OCILob</type><parameter>from</parameter></methodparam>
   </methodsynopsis>
   <para>
    Appends data from the large object to the end of another large object. 
@@ -28,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>lob_from</parameter></term>
+     <term><parameter>from</parameter></term>
      <listitem>
       <para>
        The copied LOB.
@@ -73,15 +73,14 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.flush" /></member>
-    <member><xref linkend="oci-lob.setbuffering" /></member>
-    <member><xref linkend="oci-lob.getbuffering" /></member>
+    <member><xref linkend="oci-lob.flush"/></member>
+    <member><xref linkend="oci-lob.setbuffering"/></member>
+    <member><xref linkend="oci-lob.getbuffering"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -102,4 +101,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/close.xml b/reference/oci8/OCI-Lob/close.xml
index ed2d4a195bb6..f18701fc2bcd 100644
--- a/reference/oci8/OCI-Lob/close.xml
+++ b/reference/oci8/OCI-Lob/close.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::close</methodname>
-   <void />
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::close</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Closes descriptor of LOB or FILE. This function should be used only with
-   <xref linkend="oci-lob.writetemporary" />.
+   <xref linkend="oci-lob.writetemporary"/>.
   </para>
  </refsect1>
 
@@ -57,13 +57,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.writetemporary" /></member>
+    <member><xref linkend="oci-lob.writetemporary"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/eof.xml b/reference/oci8/OCI-Lob/eof.xml
index e76ea4848b99..f73b0a0d3983 100644
--- a/reference/oci8/OCI-Lob/eof.xml
+++ b/reference/oci8/OCI-Lob/eof.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::eof</methodname>
-   <void />
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::eof</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Tells whether the internal pointer of large object is at the end of LOB.
@@ -66,13 +66,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.size" /></member>
+    <member><xref linkend="oci-lob.size"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/erase.xml b/reference/oci8/OCI-Lob/erase.xml
index 08d8ff16c2e9..db2082c14478 100644
--- a/reference/oci8/OCI-Lob/erase.xml
+++ b/reference/oci8/OCI-Lob/erase.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::erase</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::erase</methodname>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>offset</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Erases a specified portion of the internal LOB data starting at a
@@ -64,6 +64,12 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>offset</parameter> and <parameter>length</parameter> are now nullable.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0, PECL OCI8 3.0.0</entry>
       <entry>
@@ -80,13 +86,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.truncate" /></member> 
+    <member><xref linkend="oci-lob.truncate"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -107,4 +112,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/export.xml b/reference/oci8/OCI-Lob/export.xml
index cbaf8a4cd9a7..bf59339d6297 100644
--- a/reference/oci8/OCI-Lob/export.xml
+++ b/reference/oci8/OCI-Lob/export.xml
@@ -9,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::export</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::export</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>offset</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Exports LOB contents to a file. 
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        Indicates from where to start exporting.
@@ -69,6 +69,12 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>offset</parameter> and <parameter>length</parameter> are now nullable.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0, PECL OCI8 3.0.0</entry>
       <entry>
@@ -85,13 +91,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.import" /></member>
+    <member><xref linkend="oci-lob.import"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -112,4 +117,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/flush.xml b/reference/oci8/OCI-Lob/flush.xml
index 219ccf93571c..1b15bb153d18 100644
--- a/reference/oci8/OCI-Lob/flush.xml
+++ b/reference/oci8/OCI-Lob/flush.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::flush</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::flush</methodname>
+   <methodparam choice="opt"><type>int</type><parameter>flag</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>OCILob::flush</function> actually writes data to the server.
@@ -76,14 +76,13 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.getbuffering" /></member>
-    <member><xref linkend="oci-lob.setbuffering" /></member>
+    <member><xref linkend="oci-lob.getbuffering"/></member>
+    <member><xref linkend="oci-lob.setbuffering"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -104,4 +103,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/free.xml b/reference/oci8/OCI-Lob/free.xml
index e5edaf99d125..cf917a2a41c6 100644
--- a/reference/oci8/OCI-Lob/free.xml
+++ b/reference/oci8/OCI-Lob/free.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::free</methodname>
-   <void />
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::free</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Frees resources associated with the descriptor, previously allocated with 
@@ -54,7 +54,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/getBuffering.xml b/reference/oci8/OCI-Lob/getBuffering.xml
index d94f99e22936..b75f4266ef5b 100644
--- a/reference/oci8/OCI-Lob/getBuffering.xml
+++ b/reference/oci8/OCI-Lob/getBuffering.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::getBuffering</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::getBuffering</methodname>
    <void/>
   </methodsynopsis>
   <para>
@@ -57,13 +57,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.setbuffering" /></member> 
+    <member><xref linkend="oci-lob.setbuffering"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/import.xml b/reference/oci8/OCI-Lob/import.xml
index 1a33401895dd..9b7f9ddb9146 100644
--- a/reference/oci8/OCI-Lob/import.xml
+++ b/reference/oci8/OCI-Lob/import.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::import</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::import</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -68,14 +68,13 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.export" /></member> 
-    <member><xref linkend="oci-lob.write" /></member> 
+    <member><xref linkend="oci-lob.export"/></member> 
+    <member><xref linkend="oci-lob.write"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/load.xml b/reference/oci8/OCI-Lob/load.xml
index 59e0961ab4e5..84c3387aaae4 100644
--- a/reference/oci8/OCI-Lob/load.xml
+++ b/reference/oci8/OCI-Lob/load.xml
@@ -9,14 +9,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>string</type><methodname>OCILob::load</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>OCILob::load</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Returns large object's contents. As script execution is terminated
    when the <link linkend="ini.memory-limit">memory_limit</link> is reached,
    ensure that the LOB does not exceed this limit. In most cases it's
-   recommended to use <xref linkend="oci-lob.read" /> instead. 
+   recommended to use <xref linkend="oci-lob.read"/> instead. 
   </para>
  </refsect1>
 
@@ -59,13 +59,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.read" /></member>
+    <member><xref linkend="oci-lob.read"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/read.xml b/reference/oci8/OCI-Lob/read.xml
index 59d945c3c5d7..393c636df0df 100644
--- a/reference/oci8/OCI-Lob/read.xml
+++ b/reference/oci8/OCI-Lob/read.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type class="union"><type>string</type><type>false</type></type><methodname>OCILob::read</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>OCILob::read</methodname>
    <methodparam><type>int</type><parameter>length</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -73,14 +73,13 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.load" /></member> 
-    <member><xref linkend="oci-lob.write" /></member> 
+    <member><xref linkend="oci-lob.load"/></member> 
+    <member><xref linkend="oci-lob.write"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -101,4 +100,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/rewind.xml b/reference/oci8/OCI-Lob/rewind.xml
index 6b3da45589f0..07bdc7a423cb 100644
--- a/reference/oci8/OCI-Lob/rewind.xml
+++ b/reference/oci8/OCI-Lob/rewind.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::rewind</methodname>
-   <void />
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::rewind</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Sets the internal pointer to the beginning of the large object.
@@ -56,14 +56,13 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.seek" /></member> 
-    <member><xref linkend="oci-lob.tell" /></member> 
+    <member><xref linkend="oci-lob.seek"/></member> 
+    <member><xref linkend="oci-lob.tell"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/save.xml b/reference/oci8/OCI-Lob/save.xml
index 58fcc7c7336c..fce98fb04d4a 100644
--- a/reference/oci8/OCI-Lob/save.xml
+++ b/reference/oci8/OCI-Lob/save.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::save</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::save</methodname>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Saves <parameter>data</parameter> to the large object.
@@ -76,14 +76,13 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.write" /></member>
-    <member><xref linkend="oci-lob.import" /></member>
+    <member><xref linkend="oci-lob.write"/></member>
+    <member><xref linkend="oci-lob.import"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/seek.xml b/reference/oci8/OCI-Lob/seek.xml
index 2d946b1b65ca..10810cc02400 100644
--- a/reference/oci8/OCI-Lob/seek.xml
+++ b/reference/oci8/OCI-Lob/seek.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::seek</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::seek</methodname>
    <methodparam><type>int</type><parameter>offset</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>whence</parameter><initializer><constant>OCI_SEEK_SET</constant></initializer></methodparam>
   </methodsynopsis>
@@ -92,15 +92,14 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.rewind" /></member>
-    <member><xref linkend="oci-lob.tell" /></member>
-    <member><xref linkend="oci-lob.eof" /></member>
+    <member><xref linkend="oci-lob.rewind"/></member>
+    <member><xref linkend="oci-lob.tell"/></member>
+    <member><xref linkend="oci-lob.eof"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -121,4 +120,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/setBuffering.xml b/reference/oci8/OCI-Lob/setBuffering.xml
index 98e0cc4c638e..c70285053564 100644
--- a/reference/oci8/OCI-Lob/setBuffering.xml
+++ b/reference/oci8/OCI-Lob/setBuffering.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::setBuffering</methodname>
-   <methodparam><type>bool</type><parameter>on_off</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::setBuffering</methodname>
+   <methodparam><type>bool</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets the buffering for the large object, depending on the value of the
-   <parameter>on_off</parameter> parameter. 
+   <parameter>mode</parameter> parameter. 
   </para>
   <para>
    Use of this function may provide performance improvements by buffering
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>on_off</parameter></term>
+     <term><parameter>mode</parameter></term>
      <listitem>
       <para>
        &true; for on and &false; for off.
@@ -77,13 +77,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.getbuffering" /></member> 
+    <member><xref linkend="oci-lob.getbuffering"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/size.xml b/reference/oci8/OCI-Lob/size.xml
index 91b4e4f2a44f..ce4076459f59 100644
--- a/reference/oci8/OCI-Lob/size.xml
+++ b/reference/oci8/OCI-Lob/size.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::size</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::size</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Gets the size of the large object.
@@ -54,7 +54,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -75,4 +74,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/OCI-Lob/tell.xml b/reference/oci8/OCI-Lob/tell.xml
index 1e24f6941613..60e9ccbb0cba 100644
--- a/reference/oci8/OCI-Lob/tell.xml
+++ b/reference/oci8/OCI-Lob/tell.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>int</type><methodname>OCILob::tell</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::tell</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    Gets the current position of a LOB's internal pointer.
@@ -57,15 +57,14 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.rewind" /></member>
-    <member><xref linkend="oci-lob.size" /></member>
-    <member><xref linkend="oci-lob.eof" /></member>
+    <member><xref linkend="oci-lob.rewind"/></member>
+    <member><xref linkend="oci-lob.size"/></member>
+    <member><xref linkend="oci-lob.eof"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/truncate.xml b/reference/oci8/OCI-Lob/truncate.xml
index 0d4f6ecece6c..5e01ca61771e 100644
--- a/reference/oci8/OCI-Lob/truncate.xml
+++ b/reference/oci8/OCI-Lob/truncate.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>Lob::truncate</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::truncate</methodname>
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -69,13 +69,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.erase" /></member>
+    <member><xref linkend="oci-lob.erase"/></member>
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/write.xml b/reference/oci8/OCI-Lob/write.xml
index 010df926a4b1..191382552a19 100644
--- a/reference/oci8/OCI-Lob/write.xml
+++ b/reference/oci8/OCI-Lob/write.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::write</methodname>
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>OCILob::write</methodname>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Writes data from the parameter <parameter>data</parameter> into the
@@ -35,7 +35,7 @@
      <term><parameter>length</parameter></term>
      <listitem>
       <para>
-       If this parameter is given, writing will stop after 
+       If this parameter is an integer, writing will stop after
        <parameter>length</parameter> bytes have been written or the end of
        <parameter>data</parameter> is reached, whichever comes first.
       </para>
@@ -63,6 +63,12 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>length</parameter> is now nullable.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0, PECL OCI8 3.0.0</entry>
       <entry>
@@ -79,13 +85,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.read" /></member> 
+    <member><xref linkend="oci-lob.read"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/writeTemporary.xml b/reference/oci8/OCI-Lob/writeTemporary.xml
index 1212aeeef204..f55fe8f9bf47 100644
--- a/reference/oci8/OCI-Lob/writeTemporary.xml
+++ b/reference/oci8/OCI-Lob/writeTemporary.xml
@@ -9,16 +9,16 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
-   <type>bool</type><methodname>OCILob::writeTemporary</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>OCILob::writeTemporary</methodname>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>lob_type</parameter><initializer>OCI_TEMP_CLOB</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>OCI_TEMP_CLOB</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Creates a temporary large object and writes <parameter>data</parameter>
    to it.
   </para>  
   <para>
-   You should use <xref linkend="oci-lob.close" /> when you are done
+   You should use <xref linkend="oci-lob.close"/> when you are done
    with this object.
   </para>
  </refsect1>
@@ -36,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>lob_type</parameter></term>
+     <term><parameter>type</parameter></term>
      <listitem>
       <para>
        Can be one of the following:
@@ -90,13 +90,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.close" /></member> 
+    <member><xref linkend="oci-lob.close"/></member> 
    </simplelist>
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/OCI-Lob/writeToFile.xml b/reference/oci8/OCI-Lob/writeToFile.xml
index f1befba146c7..07a80ae9dddf 100644
--- a/reference/oci8/OCI-Lob/writeToFile.xml
+++ b/reference/oci8/OCI-Lob/writeToFile.xml
@@ -24,6 +24,12 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>offset</parameter> and <parameter>length</parameter> are now nullable.
+      </entry>
+     </row>
      <row>
       <entry>8.0.0, PECL OCI8 3.0.0</entry>
       <entry>
diff --git a/reference/oci8/functions/oci-bind-array-by-name.xml b/reference/oci8/functions/oci-bind-array-by-name.xml
index 711d996721e4..013733cb1687 100644
--- a/reference/oci8/functions/oci-bind-array-by-name.xml
+++ b/reference/oci8/functions/oci-bind-array-by-name.xml
@@ -11,15 +11,15 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_bind_array_by_name</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">var_array</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_table_length</parameter></methodparam>
+   <methodparam><type>string</type><parameter>param</parameter></methodparam>
+   <methodparam><type>array</type><parameter role="reference">var</parameter></methodparam>
+   <methodparam><type>int</type><parameter>max_array_length</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>max_item_length</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>SQLT_AFC</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>SQLT_AFC</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
-   Binds the PHP array <parameter>var_array</parameter> to the Oracle
-   placeholder <parameter>name</parameter>, which points to an Oracle PL/SQL
+   Binds the PHP array <parameter>var</parameter> to the Oracle
+   placeholder <parameter>param</parameter>, which points to an Oracle PL/SQL
    array. Whether it will be used for input or output will be determined at
    run-time. 
   </para>
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>name</parameter></term>
+     <term><parameter>param</parameter></term>
      <listitem>
       <para>
        The Oracle placeholder.
@@ -46,7 +46,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>var_array</parameter></term>
+     <term><parameter>var</parameter></term>
      <listitem>
       <para>
        An array.
@@ -54,7 +54,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>max_table_length</parameter></term>
+     <term><parameter>max_array_length</parameter></term>
      <listitem>
       <para>
        Sets the maximum length both for incoming and result arrays.
@@ -215,7 +215,6 @@ var_dump($array);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -236,4 +235,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-bind-by-name.xml b/reference/oci8/functions/oci-bind-by-name.xml
index 01ff3da91970..8f2b4c6d53be 100644
--- a/reference/oci8/functions/oci-bind-by-name.xml
+++ b/reference/oci8/functions/oci-bind-by-name.xml
@@ -11,14 +11,14 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_bind_by_name</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>string</type><parameter>bv_name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>maxlength</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>SQLT_CHR</initializer></methodparam>
+   <methodparam><type>string</type><parameter>param</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter role="reference">var</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>max_length</parameter><initializer>-1</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Binds a PHP variable <parameter>variable</parameter> to the Oracle
-   bind variable placeholder <parameter>bv_name</parameter>.  Binding
+   Binds a PHP variable <parameter>var</parameter> to the Oracle
+   bind variable placeholder <parameter>param</parameter>.  Binding
    is important for Oracle database performance and also as a way to
    avoid SQL Injection security issues.
   </para>
@@ -49,14 +49,14 @@
   </para>
 
   <para>
-    You must specify <parameter>maxlength</parameter> when using
+    You must specify <parameter>max_length</parameter> when using
     an <literal>OUT</literal> bind so that PHP allocates enough memory
     to hold the returned value.
   </para>
 
   <para>
     For <literal>IN</literal> binds it is recommended to set
-    the <parameter>maxlength</parameter> length if the statement is
+    the <parameter>max_length</parameter> length if the statement is
     re-executed multiple times with different values for the PHP
     variable.  Otherwise Oracle may truncate data to the length of the
     initial PHP variable value.  If you don't know what the maximum
@@ -102,32 +102,32 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>bv_name</parameter></term>
+     <term><parameter>param</parameter></term>
      <listitem>
       <para>
        The colon-prefixed bind variable placeholder used in the
        statement.  The colon is optional
-       in <parameter>bv_name</parameter>. Oracle does not use question
+       in <parameter>param</parameter>. Oracle does not use question
        marks for placeholders.
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>variable</parameter></term> 
+     <term><parameter>var</parameter></term>
      <listitem>
       <para>
-       The PHP variable to be associated with <parameter>bv_name</parameter>
+       The PHP variable to be associated with <parameter>param</parameter>
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>maxlength</parameter></term>
+     <term><parameter>max_length</parameter></term>
      <listitem>
       <para>
        Sets the maximum length for the data. If you set it to -1, this
        function will use the current length
-       of <parameter>variable</parameter> to set the maximum
-       length. In this case the <parameter>variable</parameter> must
+       of <parameter>var</parameter> to set the maximum
+       length. In this case the <parameter>var</parameter> must
        exist and contain data
        when <function>oci_bind_by_name</function> is called.
       </para>
@@ -822,7 +822,7 @@ var_dump($output2);  // false
   </note>
   <note>
    <para>
-     The PHP <parameter>variable</parameter> argument is a reference.  Some
+     The PHP <parameter>var</parameter> argument is a reference.  Some
      forms of loops do not work as expected:
    </para>
    <informalexample>
@@ -866,7 +866,6 @@ foreach ($myarray as $key => $value) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -887,4 +886,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-client-version.xml b/reference/oci8/functions/oci-client-version.xml
index aaeafb1fa354..08c12f87e2a6 100644
--- a/reference/oci8/functions/oci-client-version.xml
+++ b/reference/oci8/functions/oci-client-version.xml
@@ -27,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the version number as a string.
+   Returns the version number as a &string;.
   </para>
  </refsect1>
 
diff --git a/reference/oci8/functions/oci-close.xml b/reference/oci8/functions/oci-close.xml
index 8f7bff0525d6..f77058243d27 100644
--- a/reference/oci8/functions/oci-close.xml
+++ b/reference/oci8/functions/oci-close.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>bool</type><methodname>oci_close</methodname>
+   <type class="union"><type>bool</type><type>null</type></type><methodname>oci_close</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -45,7 +45,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   Returns &null; when <link linkend="ini.oci8.old-oci-close-semantics">oci8.old_oci_close_semantics</link> is enabled,
+   or &true; otherwise.
   </para>
  </refsect1>
 
@@ -227,7 +228,6 @@ print $r;  // displays the function return value "Finished"
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-connect.xml b/reference/oci8/functions/oci-connect.xml
index a6ee708e9597..33bc45285599 100644
--- a/reference/oci8/functions/oci-connect.xml
+++ b/reference/oci8/functions/oci-connect.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>oci_connect</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>oci_connect</methodname>
    <methodparam><type>string</type><parameter>username</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>connection_string</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>character_set</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>session_mode</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>connection_string</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>session_mode</parameter><initializer><constant>OCI_DEFAULT</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns a connection identifier needed for most other OCI8 operations.
@@ -68,7 +68,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>character_set</parameter></term>
+     <term><parameter>encoding</parameter></term>
      <listitem>
       &oci.charset;
      </listitem>
@@ -90,6 +90,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>connection_string</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -328,7 +350,6 @@ echo "c2 is $c2<br>\n";
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -349,4 +370,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-define-by-name.xml b/reference/oci8/functions/oci-define-by-name.xml
index 0bccb73356c4..8878345154e7 100644
--- a/reference/oci8/functions/oci-define-by-name.xml
+++ b/reference/oci8/functions/oci-define-by-name.xml
@@ -11,9 +11,9 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_define_by_name</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>string</type><parameter>column_name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter role="reference">variable</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>SQLT_CHR</initializer></methodparam>
+   <methodparam><type>string</type><parameter>column</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter role="reference">var</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Associates a PHP variable with a column for query fetches using <function>oci_fetch</function>.
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>column_name</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        The column name used in the query.
@@ -48,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>variable</parameter></term>
+     <term><parameter>var</parameter></term>
      <listitem>
       <para>
        The PHP variable that will contain the returned column value.
@@ -274,7 +274,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -295,4 +294,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-error.xml b/reference/oci8/functions/oci-error.xml
index 4d431e0d98f0..f849c6233070 100644
--- a/reference/oci8/functions/oci-error.xml
+++ b/reference/oci8/functions/oci-error.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>oci_error</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>resource</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>oci_error</methodname>
+   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>connection_or_statement</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the last error found.
@@ -26,14 +26,14 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>resource</parameter></term>
+     <term><parameter>connection_or_statement</parameter></term>
      <listitem>
       <para>
-       For most errors, <parameter>resource</parameter> is the
+       For most errors, <parameter>connection_or_statement</parameter> is the
        resource handle that was passed to the failing function call.
        For connection errors with <function>oci_connect</function>,
        <function>oci_new_connect</function> or 
-       <function>oci_pconnect</function> do not pass <parameter>resource</parameter>.
+       <function>oci_pconnect</function> &null; should be passed.
       </para>
      </listitem>
     </varlistentry>
@@ -97,6 +97,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>connection_or_statement</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -155,7 +177,6 @@ if (!$r) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-execute.xml b/reference/oci8/functions/oci-execute.xml
index 1529410364a5..e02849607a55 100644
--- a/reference/oci8/functions/oci-execute.xml
+++ b/reference/oci8/functions/oci-execute.xml
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_execute</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>OCI_COMMIT_ON_SUCCESS</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>OCI_COMMIT_ON_SUCCESS</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Executes a <parameter>statement</parameter> previously returned
@@ -283,7 +283,6 @@ for ($i = 1; $i <= oci_num_fields($stid); ++$i) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-fetch-all.xml b/reference/oci8/functions/oci-fetch-all.xml
index c2dcbffad9f0..0b4dc3ffc5c4 100644
--- a/reference/oci8/functions/oci-fetch-all.xml
+++ b/reference/oci8/functions/oci-fetch-all.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>oci_fetch_all</methodname>
+   <type>int</type><methodname>oci_fetch_all</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
    <methodparam><type>array</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>skip</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>maxrows</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>OCI_FETCHSTATEMENT_BY_COLUMN</constant> + <constant>OCI_ASSOC</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>OCI_FETCHSTATEMENT_BY_COLUMN | OCI_ASSOC</initializer></methodparam>
   </methodsynopsis>
   <para>
    Fetches multiple rows from a query into a two-dimensional array.
@@ -53,7 +53,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>skip</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        The number of initial rows to discard when fetching the
@@ -63,11 +63,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>maxrows</parameter></term>
+     <term><parameter>limit</parameter></term>
      <listitem>
       <para>
        The number of rows to return.  The default is -1 meaning return
-       all the rows from <parameter>skip</parameter> + 1 onwards.
+       all the rows from <parameter>offset</parameter> + 1 onwards.
       </para>
      </listitem>
     </varlistentry>
@@ -321,7 +321,7 @@ oci_close($conn);
   &reftitle.notes;
   <note>
    <para>
-     Using <parameter>skip</parameter> is very inefficient.  All the
+     Using <parameter>offset</parameter> is very inefficient.  All the
      rows to be skipped are included in the result set that is
      returned from the database to PHP.  They are then discarded.  It
      is more efficient to use SQL to restrict the offset and range of
@@ -363,7 +363,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -384,4 +383,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-fetch-array.xml b/reference/oci8/functions/oci-fetch-array.xml
index cf794f0290a4..2d9769742e72 100644
--- a/reference/oci8/functions/oci-fetch-array.xml
+++ b/reference/oci8/functions/oci-fetch-array.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>oci_fetch_array</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>oci_fetch_array</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>OCI_BOTH | OCI_RETURN_NULLS</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns an array containing the next result-set row of a query.
@@ -672,7 +672,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -693,4 +692,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-fetch-assoc.xml b/reference/oci8/functions/oci-fetch-assoc.xml
index ceaa632d05f3..754409ef8d27 100644
--- a/reference/oci8/functions/oci-fetch-assoc.xml
+++ b/reference/oci8/functions/oci-fetch-assoc.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>oci_fetch_assoc</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>oci_fetch_assoc</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -103,7 +103,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -124,4 +123,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-fetch-object.xml b/reference/oci8/functions/oci-fetch-object.xml
index c2750d8b5c12..d656c429de5e 100644
--- a/reference/oci8/functions/oci-fetch-object.xml
+++ b/reference/oci8/functions/oci-fetch-object.xml
@@ -9,8 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>object</type><methodname>oci_fetch_object</methodname>
+   <type class="union"><type>stdClass</type><type>false</type></type><methodname>oci_fetch_object</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>OCI_ASSOC | OCI_RETURN_NULLS</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns an object containing the next result-set row of a query.
@@ -207,7 +208,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -228,4 +228,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-fetch-row.xml b/reference/oci8/functions/oci-fetch-row.xml
index 7c8b7c90856c..506a5381dc65 100644
--- a/reference/oci8/functions/oci-fetch-row.xml
+++ b/reference/oci8/functions/oci-fetch-row.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>oci_fetch_row</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>oci_fetch_row</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -103,7 +103,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -124,4 +123,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-field-is-null.xml b/reference/oci8/functions/oci-field-is-null.xml
index 6e5af2c73371..c62353a7fd40 100644
--- a/reference/oci8/functions/oci-field-is-null.xml
+++ b/reference/oci8/functions/oci-field-is-null.xml
@@ -11,10 +11,10 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_field_is_null</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Checks if the given <parameter>field</parameter> from the current row of
+   Checks if the given <parameter>column</parameter> from the current row of
    <parameter>statement</parameter> is &null;. 
   </para>
  </refsect1>
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -46,7 +46,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; if <parameter>field</parameter> is &null;, &false; otherwise. 
+   Returns &true; if <parameter>column</parameter> is &null;, &false; otherwise. 
   </para>
  </refsect1>
 
@@ -107,7 +107,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-field-name.xml b/reference/oci8/functions/oci-field-name.xml
index 6d424520156c..c4943369c3e4 100644
--- a/reference/oci8/functions/oci-field-name.xml
+++ b/reference/oci8/functions/oci-field-name.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>oci_field_name</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>oci_field_name</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the name of the <parameter>field</parameter>.
+   Returns the name of the <parameter>column</parameter>.
   </para>
  </refsect1>
 
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -45,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the name as a string, or &false; on errors.
+   Returns the name as a string,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -133,7 +133,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-field-precision.xml b/reference/oci8/functions/oci-field-precision.xml
index 11d95b7df78e..42094bd4927d 100644
--- a/reference/oci8/functions/oci-field-precision.xml
+++ b/reference/oci8/functions/oci-field-precision.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>oci_field_precision</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>oci_field_precision</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns precision of the <parameter>field</parameter>.
+   Returns precision of the <parameter>column</parameter>.
   </para>
   <para>
    For FLOAT columns, precision is nonzero and scale is -127.
@@ -36,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -50,7 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the precision as an integer, or &false; on errors.
+   Returns the precision as an integer,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -121,7 +121,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-field-scale.xml b/reference/oci8/functions/oci-field-scale.xml
index fb57e4d3f567..730a0c73d1dc 100644
--- a/reference/oci8/functions/oci-field-scale.xml
+++ b/reference/oci8/functions/oci-field-scale.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>oci_field_scale</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>oci_field_scale</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the scale of the column with <parameter>field</parameter> index.
+   Returns the scale of the column with <parameter>column</parameter> index.
   </para>
   <para>
    For FLOAT columns, precision is nonzero and scale is -127.
@@ -36,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -50,7 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the scale as an integer, or &false; on errors.
+   Returns the scale as an integer,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -121,7 +121,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-field-size.xml b/reference/oci8/functions/oci-field-size.xml
index eda4a1246363..dff9323953b1 100644
--- a/reference/oci8/functions/oci-field-size.xml
+++ b/reference/oci8/functions/oci-field-size.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>oci_field_size</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>oci_field_size</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the size of a <parameter>field</parameter>. 
+   Returns the size of a <parameter>column</parameter>. 
   </para>
  </refsect1>
 
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -45,8 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the size of a <parameter>field</parameter> in bytes, or &false; on
-   errors.
+   Returns the size of a <parameter>column</parameter> in bytes,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -135,7 +134,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-field-type-raw.xml b/reference/oci8/functions/oci-field-type-raw.xml
index f704cfd35a42..aae1b4a5db98 100644
--- a/reference/oci8/functions/oci-field-type-raw.xml
+++ b/reference/oci8/functions/oci-field-type-raw.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>oci_field_type_raw</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>oci_field_type_raw</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns Oracle's raw "SQLT" data type of the <parameter>field</parameter>.
+   Returns Oracle's raw "SQLT" data type of the <parameter>column</parameter>.
   </para>
   <para>
    If you want a field's type name, then use <function>oci_field_type</function> instead. 
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -48,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns Oracle's raw data type as a number, or &false; on errors.
+   Returns Oracle's raw data type as a number,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -105,7 +105,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-field-type.xml b/reference/oci8/functions/oci-field-type.xml
index 094ee30842e9..31a0c8e6d629 100644
--- a/reference/oci8/functions/oci-field-type.xml
+++ b/reference/oci8/functions/oci-field-type.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>oci_field_type</methodname>
+   <type class="union"><type>string</type><type>int</type><type>false</type></type><methodname>oci_field_type</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns a field's data type name.
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be the field's index (1-based) or name.
@@ -45,7 +45,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the field data type as a string, or &false; on errors.
+   Returns the field data type as a &string; or an &integer;,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -135,7 +135,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-free-descriptor.xml b/reference/oci8/functions/oci-free-descriptor.xml
index 18c6fefef376..50c546dff0c7 100644
--- a/reference/oci8/functions/oci-free-descriptor.xml
+++ b/reference/oci8/functions/oci-free-descriptor.xml
@@ -8,9 +8,9 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>oci_free_descriptor</methodname>
-   <methodparam><type>resource</type><parameter>descriptor</parameter></methodparam>
+   <methodparam><type>OCILob</type><parameter>lob</parameter></methodparam>
   </methodsynopsis>
   <para>
    Frees a descriptor allocated by <function>oci_new_descriptor</function>.
@@ -61,7 +61,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-get-implicit-resultset.xml b/reference/oci8/functions/oci-get-implicit-resultset.xml
index 2dc8ee84d9c8..fbb37c584221 100644
--- a/reference/oci8/functions/oci-get-implicit-resultset.xml
+++ b/reference/oci8/functions/oci-get-implicit-resultset.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource </type><methodname>oci_get_implicit_resultset</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>oci_get_implicit_resultset</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -299,7 +299,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -320,4 +319,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-lob-copy.xml b/reference/oci8/functions/oci-lob-copy.xml
index 601e6fb4239c..91f803c3e71e 100644
--- a/reference/oci8/functions/oci-lob-copy.xml
+++ b/reference/oci8/functions/oci-lob-copy.xml
@@ -10,9 +10,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>oci_lob_copy</methodname>
-   <methodparam><type>OCILob</type><parameter>lob_to</parameter></methodparam>
-   <methodparam><type>OCILob</type><parameter>lob_from</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
+   <methodparam><type>OCILob</type><parameter>to</parameter></methodparam>
+   <methodparam><type>OCILob</type><parameter>from</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Copies a large object or a part of a large object to another large object.
@@ -29,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>lob_to</parameter></term>
+     <term><parameter>to</parameter></term>
      <listitem>
       <para>
        The destination LOB.
@@ -37,7 +37,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>lob_from</parameter></term>
+     <term><parameter>from</parameter></term>
      <listitem>
       <para>
        The copied LOB.
@@ -63,6 +63,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>length</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
@@ -73,7 +95,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -94,5 +115,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
-
diff --git a/reference/oci8/functions/oci-lob-is-equal.xml b/reference/oci8/functions/oci-lob-is-equal.xml
index 640acad38ae2..793ae7288854 100644
--- a/reference/oci8/functions/oci-lob-is-equal.xml
+++ b/reference/oci8/functions/oci-lob-is-equal.xml
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>oci_lob_is_equal</methodname>
-   <methodparam><type>OCI-Lob</type><parameter>lob1</parameter></methodparam>
-   <methodparam><type>OCI-Lob</type><parameter>lob2</parameter></methodparam>
+   <methodparam><type>OCILob</type><parameter>lob1</parameter></methodparam>
+   <methodparam><type>OCILob</type><parameter>lob2</parameter></methodparam>
   </methodsynopsis>
   <para>
    Compares two LOB/FILE locators. 
@@ -59,7 +59,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -80,4 +79,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-new-collection.xml b/reference/oci8/functions/oci-new-collection.xml
index 821db6c70811..409ceb8d6966 100644
--- a/reference/oci8/functions/oci-new-collection.xml
+++ b/reference/oci8/functions/oci-new-collection.xml
@@ -9,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>OCICollection</type><methodname>oci_new_collection</methodname>
+   <type class="union"><type>OCICollection</type><type>false</type></type><methodname>oci_new_collection</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>tdo</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>string</type><parameter>type_name</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Allocates a new collection object.
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>tdo</parameter></term>
+     <term><parameter>type_name</parameter></term>
      <listitem>
       <para>
        Should be a valid named type (uppercase).
@@ -45,7 +45,7 @@
      <listitem>
       <para>
        Should point to the scheme, where the named type was created. The name
-       of the current user is the default value.
+       of the current user is used when &null; is passed.
       </para>
      </listitem>
     </varlistentry>
@@ -61,6 +61,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>schema</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
@@ -79,7 +101,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -100,4 +121,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/oci8/functions/oci-new-connect.xml b/reference/oci8/functions/oci-new-connect.xml
index be0268c0be2b..4f0e5a20e038 100644
--- a/reference/oci8/functions/oci-new-connect.xml
+++ b/reference/oci8/functions/oci-new-connect.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>oci_new_connect</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>oci_new_connect</methodname>
    <methodparam><type>string</type><parameter>username</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>connection_string</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>character_set</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>session_mode</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>connection_string</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>session_mode</parameter><initializer><constant>OCI_DEFAULT</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Establishes a new connection to an Oracle server and logs on.
@@ -55,7 +55,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>character_set</parameter></term>
+     <term><parameter>encoding</parameter></term>
      <listitem>
       &oci.charset;
      </listitem>
@@ -77,6 +77,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0, PECL OCI8 3.0.0</entry>
+      <entry>
+       <parameter>connection_string</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -146,7 +168,6 @@ query("new connection after commit", $c2);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-new-cursor.xml b/reference/oci8/functions/oci-new-cursor.xml
index 517ebb8601e0..17212cb5c684 100644
--- a/reference/oci8/functions/oci-new-cursor.xml
+++ b/reference/oci8/functions/oci-new-cursor.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>oci_new_cursor</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>oci_new_cursor</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -96,7 +96,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-new-descriptor.xml b/reference/oci8/functions/oci-new-descriptor.xml
index eea57f3ca34a..e31d3746cb4b 100644
--- a/reference/oci8/functions/oci-new-descriptor.xml
+++ b/reference/oci8/functions/oci-new-descriptor.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>OCI-Lob</type><methodname>oci_new_descriptor</methodname>
+   <type class="union"><type>OCILob</type><type>null</type></type><methodname>oci_new_descriptor</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>OCI_DTYPE_LOB</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>OCI_DTYPE_LOB</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Allocates resources to hold descriptor or LOB locator. 
@@ -48,7 +48,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a new LOB or FILE descriptor on success, &false; on error.
+   Returns a new LOB or FILE descriptor on success, or &null; on failure.
   </para>
  </refsect1>
 
@@ -188,7 +188,6 @@ oci_free_statement($stmt);
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-num-fields.xml b/reference/oci8/functions/oci-num-fields.xml
index cee73469f55d..c7abfc70fdc7 100644
--- a/reference/oci8/functions/oci-num-fields.xml
+++ b/reference/oci8/functions/oci-num-fields.xml
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the number of columns as an integer, or &false; on errors.
+   Returns the number of columns as an <type>int</type>.
   </para>
  </refsect1>
 
diff --git a/reference/oci8/functions/oci-num-rows.xml b/reference/oci8/functions/oci-num-rows.xml
index 3d0b6baf6283..6ad889bc03e1 100644
--- a/reference/oci8/functions/oci-num-rows.xml
+++ b/reference/oci8/functions/oci-num-rows.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>oci_num_rows</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>oci_num_rows</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -36,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns the number of rows affected as an integer, or &false; on errors.
+   Returns the number of rows affected as an integer,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -99,7 +99,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-parse.xml b/reference/oci8/functions/oci-parse.xml
index 18677c53c61a..25520801e980 100644
--- a/reference/oci8/functions/oci-parse.xml
+++ b/reference/oci8/functions/oci-parse.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>oci_parse</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>oci_parse</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sql_text</parameter></methodparam>
+   <methodparam><type>string</type><parameter>sql</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Prepares <parameter>sql_text</parameter> using
+   Prepares <parameter>sql</parameter> using
    <parameter>connection</parameter> and returns the statement identifier,
    which can be used with <function>oci_bind_by_name</function>, 
    <function>oci_execute</function> and other functions.
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sql_text</parameter></term>
+     <term><parameter>sql</parameter></term>
      <listitem>
       <para>
        The SQL or PL/SQL statement.
@@ -144,8 +144,8 @@ oci_close($conn);
   <note>
    <para>
     This function <emphasis>does not</emphasis> validate 
-    <parameter>sql_text</parameter>. The only way to find out if
-    <parameter>sql_text</parameter> is a valid SQL or PL/SQL statement
+    <parameter>sql</parameter>. The only way to find out if
+    <parameter>sql</parameter> is a valid SQL or PL/SQL statement
     is to execute it.
    </para>
   </note>
@@ -162,7 +162,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-password-change.xml b/reference/oci8/functions/oci-password-change.xml
index a946ca4542e1..f57b5fe363f4 100644
--- a/reference/oci8/functions/oci-password-change.xml
+++ b/reference/oci8/functions/oci-password-change.xml
@@ -15,13 +15,13 @@
    <methodparam><type>string</type><parameter>old_password</parameter></methodparam>
    <methodparam><type>string</type><parameter>new_password</parameter></methodparam>
   </methodsynopsis>
-   <methodsynopsis>
-    <type>resource</type><methodname>oci_password_change</methodname>
-    <methodparam><type>string</type><parameter>dbname</parameter></methodparam>
-    <methodparam><type>string</type><parameter>username</parameter></methodparam>
-    <methodparam><type>string</type><parameter>old_password</parameter></methodparam>
-    <methodparam><type>string</type><parameter>new_password</parameter></methodparam>
-   </methodsynopsis>
+  <methodsynopsis>
+   <type>resource</type><methodname>oci_password_change</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>username</parameter></methodparam>
+   <methodparam><type>string</type><parameter>old_password</parameter></methodparam>
+   <methodparam><type>string</type><parameter>new_password</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Changes password for user with <parameter>username</parameter>.
   </para>
@@ -69,7 +69,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dbname</parameter></term>
+     <term><parameter>database_name</parameter></term>
      <listitem>
       <para>
        The database name.
@@ -83,7 +83,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   When <parameter>connection</parameter> is provided, <function>oci_password_change</function> returns &true; on success,
+   &return.falseforfailure; When <parameter>connection</parameter> is provided, <function>oci_password_change</function> returns
+   the connection resource on success,&return.falseforfailure;
   </para>
  </refsect1>
 
@@ -186,7 +188,6 @@ if (!$c) {  // The original error wasn't 28001, or the password change failed
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-pconnect.xml b/reference/oci8/functions/oci-pconnect.xml
index 5f100614dcbd..3ca74f5f426f 100644
--- a/reference/oci8/functions/oci-pconnect.xml
+++ b/reference/oci8/functions/oci-pconnect.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>oci_pconnect</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>oci_pconnect</methodname>
    <methodparam><type>string</type><parameter>username</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>connection_string</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>character_set</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>session_mode</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>connection_string</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>""</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>session_mode</parameter><initializer><constant>OCI_DEFAULT</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Creates a persistent connection to an Oracle server and logs on. 
@@ -56,7 +56,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>character_set</parameter></term>
+     <term><parameter>encoding</parameter></term>
      <listitem>
       &oci.charset;
      </listitem>
@@ -123,8 +123,7 @@ echo "</table>\n";
    <simpara>
     Starting with PHP 5.1.2 and PECL OCI8 1.1, the lifetime and
     maximum number of persistent Oracle connections per PHP process can be tuned by setting
-    the following configuration values: <link
-     linkend="ini.oci8.persistent-timeout">oci8.persistent_timeout</link>,
+    the following configuration values: <link linkend="ini.oci8.persistent-timeout">oci8.persistent_timeout</link>,
     <link linkend="ini.oci8.ping-interval">oci8.ping_interval</link> and
     <link linkend="ini.oci8.max-persistent">oci8.max_persistent</link>.
    </simpara>
@@ -142,7 +141,6 @@ echo "</table>\n";
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-register-taf-callback.xml b/reference/oci8/functions/oci-register-taf-callback.xml
index 9cd62040fd78..d75dea0b3a73 100755
--- a/reference/oci8/functions/oci-register-taf-callback.xml
+++ b/reference/oci8/functions/oci-register-taf-callback.xml
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_register_taf_callback</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>callbackFn</parameter></methodparam>
+   <methodparam><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter></methodparam>
   </methodsynopsis>
   <para>
    Registers a user-defined callback function to <parameter>connection</parameter>.
@@ -48,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>callbackFn</parameter></term>
+     <term><parameter>callback</parameter></term>
      <listitem>
       <para>
        A user-defined callback to register for Oracle TAF. It can be a
@@ -90,7 +90,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-result.xml b/reference/oci8/functions/oci-result.xml
index 2f68f051d0c5..af5cfeab5122 100644
--- a/reference/oci8/functions/oci-result.xml
+++ b/reference/oci8/functions/oci-result.xml
@@ -11,10 +11,10 @@
   <methodsynopsis>
    <type>mixed</type><methodname>oci_result</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>column</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the data from <parameter>field</parameter> in the current row,
+   Returns the data from <parameter>column</parameter> in the current row,
    fetched by <function>oci_fetch</function>. 
   </para>
   &oci.datatypes;
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>field</parameter></term>
+     <term><parameter>column</parameter></term>
      <listitem>
       <para>
        Can be either use the column number (1-based) or the column name.
@@ -118,7 +118,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-server-version.xml b/reference/oci8/functions/oci-server-version.xml
index 14dea681b12d..3b3f4b59fd33 100644
--- a/reference/oci8/functions/oci-server-version.xml
+++ b/reference/oci8/functions/oci-server-version.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>oci_server_version</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>oci_server_version</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -84,7 +84,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-set-action.xml b/reference/oci8/functions/oci-set-action.xml
index d03d938a682a..3712bb7a24d5 100644
--- a/reference/oci8/functions/oci-set-action.xml
+++ b/reference/oci8/functions/oci-set-action.xml
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_set_action</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>action_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>action</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets the action name for Oracle tracing.
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>action_name</parameter></term>
+     <term><parameter>action</parameter></term>
      <listitem>
       <para>
        User chosen string up to 32 bytes long.
@@ -118,7 +118,6 @@ SQL> select action from v$session;
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-set-call-timeout.xml b/reference/oci8/functions/oci-set-call-timeout.xml
index df0abdf40df6..935c217f3b0e 100644
--- a/reference/oci8/functions/oci-set-call-timeout.xml
+++ b/reference/oci8/functions/oci-set-call-timeout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.oci-set-call-timout">
+<refentry xml:id="function.oci-set-call-timout" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>oci_set_call_timeout</refname>
   <refpurpose>Sets a millisecond timeout for database calls</refpurpose>
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_set_call_timeout</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>time_out</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets a timeout limiting the maxium time a database round-trip using this connection may take.
@@ -56,7 +56,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>time_out</parameter></term>
+     <term><parameter>timeout</parameter></term>
      <listitem>
       <para>
        The maximum time in milliseconds that any single round-trip between PHP and Oracle Database may take.
@@ -94,7 +94,6 @@ oci_set_call_timeout($conn, 5000);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-set-client-identifier.xml b/reference/oci8/functions/oci-set-client-identifier.xml
index b8b0f8ae1695..915c40046654 100644
--- a/reference/oci8/functions/oci-set-client-identifier.xml
+++ b/reference/oci8/functions/oci-set-client-identifier.xml
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_set_client_identifier</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>client_identifier</parameter></methodparam>
+   <methodparam><type>string</type><parameter>client_id</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets the client identifier used by various database components to
@@ -47,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>client_identifier</parameter></term>
+     <term><parameter>client_id</parameter></term>
      <listitem>
       <para>
        User chosen string up to 64 bytes long.
@@ -113,7 +113,6 @@ oci_execute($s);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-set-db-operation.xml b/reference/oci8/functions/oci-set-db-operation.xml
index f368202e80a5..db40716ead95 100644
--- a/reference/oci8/functions/oci-set-db-operation.xml
+++ b/reference/oci8/functions/oci-set-db-operation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.oci-set-db-operation">
+<refentry xml:id="function.oci-set-db-operation" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>oci_set_db_operation</refname>
   <refpurpose>Sets the database operation</refpurpose>
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_set_db_operation</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dbop</parameter></methodparam>
+   <methodparam><type>string</type><parameter>action</parameter></methodparam>
   </methodsynopsis>
   <para>
     Sets the DBOP for Oracle tracing.
@@ -42,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>dbop</parameter></term>
+     <term><parameter>action</parameter></term>
      <listitem>
       <para>
        User chosen string.
@@ -115,7 +115,6 @@ SQL> select dbop_name from v$sql_monitor;
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-set-module-name.xml b/reference/oci8/functions/oci-set-module-name.xml
index eebc55247104..e9849e06e341 100644
--- a/reference/oci8/functions/oci-set-module-name.xml
+++ b/reference/oci8/functions/oci-set-module-name.xml
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>oci_set_module_name</methodname>
    <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>module_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets the module name for Oracle tracing.
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>module_name</parameter></term>
+     <term><parameter>name</parameter></term>
      <listitem>
       <para>
        User chosen <type>string</type> up to 48 bytes long.
@@ -117,7 +117,6 @@ SQL> select module from v$session;
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/functions/oci-statement-type.xml b/reference/oci8/functions/oci-statement-type.xml
index 56ab4ab4ee75..ff1b3488096f 100644
--- a/reference/oci8/functions/oci-statement-type.xml
+++ b/reference/oci8/functions/oci-statement-type.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>oci_statement_type</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>oci_statement_type</methodname>
    <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -51,11 +51,11 @@
      <tbody>
       <row>
        <entry><literal>ALTER</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>BEGIN</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>CALL</literal></entry>
@@ -63,35 +63,35 @@
       </row>
       <row>
        <entry><literal>CREATE</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>DECLARE</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>DELETE</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>DROP</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>INSERT</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>SELECT</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>UPDATE</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
       <row>
        <entry><literal>UNKNOWN</literal></entry>
-       <entry></entry>
+       <entry/>
       </row>
      </tbody>
     </tgroup>
@@ -132,7 +132,6 @@ oci_close($conn);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml