diff --git a/reference/bc/bcmath.number.xml b/reference/bc/bcmath.number.xml
index 205df12422..74644b67a1 100644
--- a/reference/bc/bcmath.number.xml
+++ b/reference/bc/bcmath.number.xml
@@ -34,38 +34,42 @@
   <section xml:id="bcmath-number.synopsis">
    &reftitle.classsynopsis;
 
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <modifier>readonly</modifier>
-     <classname>BcMath\Number</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>BcMath</package>
 
-    <oointerface>
-     <modifier>implements</modifier>
-     <interfacename>Stringable</interfacename>
-    </oointerface>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <modifier>readonly</modifier>
+      <classname>Number</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="bcmath-number.props.value">value</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="bcmath-number.props.scale">scale</varname>
-    </fieldsynopsis>
+     <oointerface>
+      <modifier>implements</modifier>
+      <interfacename>Stringable</interfacename>
+     </oointerface>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.bcmath-number')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='BcMath\\Number'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.bcmath-number')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='BcMath\\Number'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <type>string</type>
+      <varname linkend="bcmath-number.props.value">value</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <type>int</type>
+      <varname linkend="bcmath-number.props.scale">scale</varname>
+     </fieldsynopsis>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.bcmath-number')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='BcMath\\Number'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.bcmath-number')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='BcMath\\Number'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
   </section>
 
   <section xml:id="bcmath-number.props">
diff --git a/reference/ffi/ffi.ctype.xml b/reference/ffi/ffi.ctype.xml
index 3746f2245d..9bad3a52eb 100644
--- a/reference/ffi/ffi.ctype.xml
+++ b/reference/ffi/ffi.ctype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi-ctype" role="class">
+<reference xml:id="class.ffi-ctype" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>C Type Handles</title>
  <titleabbrev>FFI\CType</titleabbrev>
@@ -20,247 +20,251 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>FFI\CType</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>FFI</package>
 
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-void">FFI\CType::TYPE_VOID</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-float">FFI\CType::TYPE_FLOAT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-double">FFI\CType::TYPE_DOUBLE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-longdouble">FFI\CType::TYPE_LONGDOUBLE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-uint8">FFI\CType::TYPE_UINT8</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-sint8">FFI\CType::TYPE_SINT8</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-uint16">FFI\CType::TYPE_UINT16</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-sint16">FFI\CType::TYPE_SINT16</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-uint32">FFI\CType::TYPE_UINT32</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-sint32">FFI\CType::TYPE_SINT32</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-uint64">FFI\CType::TYPE_UINT64</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-sint64">FFI\CType::TYPE_SINT64</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-enum">FFI\CType::TYPE_ENUM</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-bool">FFI\CType::TYPE_BOOL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-char">FFI\CType::TYPE_CHAR</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-pointer">FFI\CType::TYPE_POINTER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-func">FFI\CType::TYPE_FUNC</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-array">FFI\CType::TYPE_ARRAY</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.type-struct">FFI\CType::TYPE_STRUCT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-const">FFI\CType::ATTR_CONST</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-incomplete-tag">FFI\CType::ATTR_INCOMPLETE_TAG</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-variadic">FFI\CType::ATTR_VARIADIC</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-incomplete-array">FFI\CType::ATTR_INCOMPLETE_ARRAY</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-vla">FFI\CType::ATTR_VLA</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-union">FFI\CType::ATTR_UNION</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-packed">FFI\CType::ATTR_PACKED</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-ms-struct">FFI\CType::ATTR_MS_STRUCT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.attr-gcc-struct">FFI\CType::ATTR_GCC_STRUCT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-default">FFI\CType::ABI_DEFAULT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-cdecl">FFI\CType::ABI_CDECL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-fastcall">FFI\CType::ABI_FASTCALL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-thiscall">FFI\CType::ABI_THISCALL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-stdcall">FFI\CType::ABI_STDCALL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-pascal">FFI\CType::ABI_PASCAL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-register">FFI\CType::ABI_REGISTER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-ms">FFI\CType::ABI_MS</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-sysv">FFI\CType::ABI_SYSV</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ffi-ctype.constants.abi-vectorcall">FFI\CType::ABI_VECTORCALL</varname>
-    </fieldsynopsis>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>CType</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ffi-ctype')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='FFI\\CType'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-void">FFI\CType::TYPE_VOID</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-float">FFI\CType::TYPE_FLOAT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-double">FFI\CType::TYPE_DOUBLE</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-longdouble">FFI\CType::TYPE_LONGDOUBLE</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-uint8">FFI\CType::TYPE_UINT8</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-sint8">FFI\CType::TYPE_SINT8</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-uint16">FFI\CType::TYPE_UINT16</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-sint16">FFI\CType::TYPE_SINT16</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-uint32">FFI\CType::TYPE_UINT32</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-sint32">FFI\CType::TYPE_SINT32</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-uint64">FFI\CType::TYPE_UINT64</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-sint64">FFI\CType::TYPE_SINT64</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-enum">FFI\CType::TYPE_ENUM</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-bool">FFI\CType::TYPE_BOOL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-char">FFI\CType::TYPE_CHAR</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-pointer">FFI\CType::TYPE_POINTER</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-func">FFI\CType::TYPE_FUNC</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-array">FFI\CType::TYPE_ARRAY</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.type-struct">FFI\CType::TYPE_STRUCT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-const">FFI\CType::ATTR_CONST</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-incomplete-tag">FFI\CType::ATTR_INCOMPLETE_TAG</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-variadic">FFI\CType::ATTR_VARIADIC</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-incomplete-array">FFI\CType::ATTR_INCOMPLETE_ARRAY</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-vla">FFI\CType::ATTR_VLA</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-union">FFI\CType::ATTR_UNION</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-packed">FFI\CType::ATTR_PACKED</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-ms-struct">FFI\CType::ATTR_MS_STRUCT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.attr-gcc-struct">FFI\CType::ATTR_GCC_STRUCT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-default">FFI\CType::ABI_DEFAULT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-cdecl">FFI\CType::ABI_CDECL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-fastcall">FFI\CType::ABI_FASTCALL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-thiscall">FFI\CType::ABI_THISCALL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-stdcall">FFI\CType::ABI_STDCALL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-pascal">FFI\CType::ABI_PASCAL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-register">FFI\CType::ABI_REGISTER</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-ms">FFI\CType::ABI_MS</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-sysv">FFI\CType::ABI_SYSV</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="ffi-ctype.constants.abi-vectorcall">FFI\CType::ABI_VECTORCALL</varname>
+     </fieldsynopsis>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ffi-ctype')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='FFI\\CType'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/ffi/ffi.exception.xml b/reference/ffi/ffi.exception.xml
index 38704188f4..b45b2ff2d9 100644
--- a/reference/ffi/ffi.exception.xml
+++ b/reference/ffi/ffi.exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi-exception" role="class">
+<reference xml:id="class.ffi-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>FFI Exceptions</title>
  <titleabbrev>FFI\Exception</titleabbrev>
@@ -20,29 +20,33 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>FFI\Exception</exceptionname>
-    </ooexception>
+   <packagesynopsis>
+    <package>FFI</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Error</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooexception>
+      <exceptionname>Exception</exceptionname>
+     </ooexception>
 
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>Error</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/ffi/ffi.parserexception.xml b/reference/ffi/ffi.parserexception.xml
index 631751e4ea..60fad6114e 100644
--- a/reference/ffi/ffi.parserexception.xml
+++ b/reference/ffi/ffi.parserexception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.ffi-parserexception" role="class">
+<reference xml:id="class.ffi-parserexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>FFI Parser Exceptions</title>
  <titleabbrev>FFI\ParserException</titleabbrev>
@@ -20,30 +20,34 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <modifier>final</modifier>
-     <exceptionname>FFI\ParserException</exceptionname>
-    </ooexception>
+   <packagesynopsis>
+    <package>FFI</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>FFI\Exception</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooexception>
+      <modifier>final</modifier>
+      <exceptionname>ParserException</exceptionname>
+     </ooexception>
 
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>FFI\Exception</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/pdo_dblib/pdo-dblib.xml b/reference/pdo_dblib/pdo-dblib.xml
index 60ad7638ce..b838fd9833 100644
--- a/reference/pdo_dblib/pdo-dblib.xml
+++ b/reference/pdo_dblib/pdo-dblib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pdo-dblib" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-dblib" role="class">
  <title>The Pdo\Dblib class</title>
  <titleabbrev>Pdo\Dblib</titleabbrev>
 
@@ -18,69 +18,77 @@
   <section xml:id="pdo-dblib.synopsis">
    &reftitle.classsynopsis;
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Pdo\Dblib</classname>
-    </ooclass>
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>PDO</classname>
-    </ooclass>
-    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
-     <xi:fallback/>
-    </xi:include>
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-connection-timeout">Pdo\Dblib::ATTR_CONNECTION_TIMEOUT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-query-timeout">Pdo\Dblib::ATTR_QUERY_TIMEOUT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-stringify-uniqueidentifier">Pdo\Dblib::ATTR_STRINGIFY_UNIQUEIDENTIFIER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-version">Pdo\Dblib::ATTR_VERSION</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-tds-version">Pdo\Dblib::ATTR_TDS_VERSION</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-skip-empty-rowsets">Pdo\Dblib::ATTR_SKIP_EMPTY_ROWSETS</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-dblib.constants.attr-datetime-convert">Pdo\Dblib::ATTR_DATETIME_CONVERT</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>Pdo</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <classname>Dblib</classname>
+     </ooclass>
+
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>PDO</classname>
+     </ooclass>
+
+     <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-connection-timeout">Pdo\Dblib::ATTR_CONNECTION_TIMEOUT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-query-timeout">Pdo\Dblib::ATTR_QUERY_TIMEOUT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-stringify-uniqueidentifier">Pdo\Dblib::ATTR_STRINGIFY_UNIQUEIDENTIFIER</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-version">Pdo\Dblib::ATTR_VERSION</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-tds-version">Pdo\Dblib::ATTR_TDS_VERSION</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-skip-empty-rowsets">Pdo\Dblib::ATTR_SKIP_EMPTY_ROWSETS</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-dblib.constants.attr-datetime-convert">Pdo\Dblib::ATTR_DATETIME_CONVERT</varname>
+     </fieldsynopsis>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/pdo_firebird/pdo-firebird.xml b/reference/pdo_firebird/pdo-firebird.xml
index df8d710c8b..9706e9bc35 100644
--- a/reference/pdo_firebird/pdo-firebird.xml
+++ b/reference/pdo_firebird/pdo-firebird.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pdo-firebird" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-firebird" role="class">
  <title>The Pdo\Firebird class</title>
  <titleabbrev>Pdo\Firebird</titleabbrev>
 
@@ -18,84 +18,88 @@
   <section xml:id="pdo-firebird.synopsis">
    &reftitle.classsynopsis;
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Pdo\Firebird</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Pdo</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>PDO</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooclass>
+      <classname>Firebird</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>PDO</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.attr-date-format">Pdo\Firebird::ATTR_DATE_FORMAT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.attr-time-format">Pdo\Firebird::ATTR_TIME_FORMAT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.attr-timestamp-format">Pdo\Firebird::ATTR_TIMESTAMP_FORMAT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.transaction-isolation-level">Pdo\Firebird::TRANSACTION_ISOLATION_LEVEL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.read-committed">Pdo\Firebird::READ_COMMITTED</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.repeatable-read">Pdo\Firebird::REPEATABLE_READ</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.serializable">Pdo\Firebird::SERIALIZABLE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-firebird.constants.writable-transaction">Pdo\Firebird::WRITABLE_TRANSACTION</varname>
-    </fieldsynopsis>
+     <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+      <xi:fallback/>
+     </xi:include>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo-firebird')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Pdo\\Firebird'])">
-     <xi:fallback/>
-    </xi:include>
+     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.attr-date-format">Pdo\Firebird::ATTR_DATE_FORMAT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.attr-time-format">Pdo\Firebird::ATTR_TIME_FORMAT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.attr-timestamp-format">Pdo\Firebird::ATTR_TIMESTAMP_FORMAT</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.transaction-isolation-level">Pdo\Firebird::TRANSACTION_ISOLATION_LEVEL</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.read-committed">Pdo\Firebird::READ_COMMITTED</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.repeatable-read">Pdo\Firebird::REPEATABLE_READ</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.serializable">Pdo\Firebird::SERIALIZABLE</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-firebird.constants.writable-transaction">Pdo\Firebird::WRITABLE_TRANSACTION</varname>
+     </fieldsynopsis>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo-firebird')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Pdo\\Firebird'])">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/pdo_odbc/pdo-odbc.xml b/reference/pdo_odbc/pdo-odbc.xml
index d59815023a..1a9b236349 100644
--- a/reference/pdo_odbc/pdo-odbc.xml
+++ b/reference/pdo_odbc/pdo-odbc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pdo-odbc" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-odbc" role="class">
  <title>The Pdo\Odbc class</title>
  <titleabbrev>Pdo\Odbc</titleabbrev>
 
@@ -19,61 +19,65 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Pdo\Odbc</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Pdo</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>PDO</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooclass>
+      <classname>Odbc</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>PDO</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-odbc.constants.attr-use-cursor-library">Pdo\Odbc::ATTR_USE_CURSOR_LIBRARY</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-odbc.constants.attr-assume-utf8">Pdo\Odbc::ATTR_ASSUME_UTF8</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-odbc.constants.sql-use-if-needed">Pdo\Odbc::SQL_USE_IF_NEEDED</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-odbc.constants.sql-use-driver">Pdo\Odbc::SQL_USE_DRIVER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-odbc.constants.sql-use-odbc">Pdo\Odbc::SQL_USE_ODBC</varname>
-    </fieldsynopsis>
+     <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+      <xi:fallback/>
+     </xi:include>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-odbc.constants.attr-use-cursor-library">Pdo\Odbc::ATTR_USE_CURSOR_LIBRARY</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-odbc.constants.attr-assume-utf8">Pdo\Odbc::ATTR_ASSUME_UTF8</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-odbc.constants.sql-use-if-needed">Pdo\Odbc::SQL_USE_IF_NEEDED</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-odbc.constants.sql-use-driver">Pdo\Odbc::SQL_USE_DRIVER</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-odbc.constants.sql-use-odbc">Pdo\Odbc::SQL_USE_ODBC</varname>
+     </fieldsynopsis>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/pdo_pgsql/pdo-pgsql.xml b/reference/pdo_pgsql/pdo-pgsql.xml
index 68e1b74182..3eb9176dfa 100644
--- a/reference/pdo_pgsql/pdo-pgsql.xml
+++ b/reference/pdo_pgsql/pdo-pgsql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pdo-pgsql" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-pgsql" role="class">
  <title>The Pdo\Pgsql class</title>
  <titleabbrev>Pdo\Pgsql</titleabbrev>
 
@@ -51,78 +51,82 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Pdo\Pgsql</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Pdo</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>PDO</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooclass>
+      <classname>Pgsql</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>PDO</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.attr-disable-prepares">Pdo\Pgsql::ATTR_DISABLE_PREPARES</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.attr-result-memory-size">Pdo\Pgsql::ATTR_RESULT_MEMORY_SIZE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.transaction-idle">Pdo\Pgsql::TRANSACTION_IDLE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.transaction-active">Pdo\Pgsql::TRANSACTION_ACTIVE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.transaction-intrans">Pdo\Pgsql::TRANSACTION_INTRANS</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.transaction-inerror">Pdo\Pgsql::TRANSACTION_INERROR</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="pdo-pgsql.constants.transaction-unknown">Pdo\Pgsql::TRANSACTION_UNKNOWN</varname>
-    </fieldsynopsis>
+     <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+      <xi:fallback/>
+     </xi:include>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo-pgsql')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Pdo\\Pgsql'])">
-     <xi:fallback/>
-    </xi:include>
+     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.attr-disable-prepares">Pdo\Pgsql::ATTR_DISABLE_PREPARES</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.attr-result-memory-size">Pdo\Pgsql::ATTR_RESULT_MEMORY_SIZE</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.transaction-idle">Pdo\Pgsql::TRANSACTION_IDLE</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.transaction-active">Pdo\Pgsql::TRANSACTION_ACTIVE</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.transaction-intrans">Pdo\Pgsql::TRANSACTION_INTRANS</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.transaction-inerror">Pdo\Pgsql::TRANSACTION_INERROR</varname>
+     </fieldsynopsis>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>const</modifier>
+      <type>int</type>
+      <varname linkend="pdo-pgsql.constants.transaction-unknown">Pdo\Pgsql::TRANSACTION_UNKNOWN</varname>
+     </fieldsynopsis>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo-pgsql')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Pdo\\Pgsql'])">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pdo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='PDO'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>