diff --git a/reference/pdo_dblib/pdo-dblib.xml b/reference/pdo_dblib/pdo-dblib.xml
index 646d4b067..a7015046e 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"?><!-- EN-Revision: ae7db14ea8cb8f3041e114f0ef865d86a95f72d6 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
-<reference xml:id="class.pdo-dblib" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 3f82c54505bbf99a7dfdee2ae7f674b1e2719bd3 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-dblib" role="class">
  <title>A classe Pdo\Dblib</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 4159c67d6..e79001c88 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"?><!-- EN-Revision: ae7db14ea8cb8f3041e114f0ef865d86a95f72d6 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
-<reference xml:id="class.pdo-firebird" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 3f82c54505bbf99a7dfdee2ae7f674b1e2719bd3 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-firebird" role="class">
  <title>A classe Pdo\Firebird</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 2931bbc88..b08156dca 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"?><!-- EN-Revision: ae7db14ea8cb8f3041e114f0ef865d86a95f72d6 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
-<reference xml:id="class.pdo-odbc" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 3f82c54505bbf99a7dfdee2ae7f674b1e2719bd3 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-odbc" role="class">
  <title>A classe Pdo\Odbc</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 c2c6d590a..3f3b7b24b 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"?><!-- EN-Revision: ae7db14ea8cb8f3041e114f0ef865d86a95f72d6 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
-<reference xml:id="class.pdo-pgsql" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 3f82c54505bbf99a7dfdee2ae7f674b1e2719bd3 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
+<reference xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pdo-pgsql" role="class">
  <title>A classe Pdo\Pgsql</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>