diff --git a/documentation/manual/pom.xml b/documentation/manual/pom.xml
index 40b05316ff..0040622abe 100644
--- a/documentation/manual/pom.xml
+++ b/documentation/manual/pom.xml
@@ -32,6 +32,11 @@
                 <extensions>true</extensions>
 
                 <dependencies>
+                    <dependency>
+                        <groupId>net.sf.docbook</groupId>
+                        <artifactId>docbook</artifactId>
+                        <version>1.72.0</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.hibernate</groupId>
                         <artifactId>hibernate-jdocbook-style</artifactId>
diff --git a/documentation/manual/src/main/docbook/en-US/content/tutorial.xml b/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
index 092f73ad4c..6e6c3df94e 100644
--- a/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
@@ -846,7 +846,7 @@ public class EventManager {
                 Here, we are using a Hibernate Query Language (HQL) query to load all existing
                 <literal>Event</literal> objects from the database. Hibernate will generate the
                 appropriate SQL, send it to the database and populate <literal>Event</literal> objects
-                with the data. You can create more complex queries with HQL. See <xref linkend="query-hql"/>
+                with the data. You can create more complex queries with HQL. See <xref linkend="queryhql"/>
                 for more information.
             </para>
 
diff --git a/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po b/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po
index 3008316f7a..c4840d6aac 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po
@@ -883,7 +883,7 @@ msgstr "Recuperaci&#x00f3;n por uni&#x00f3;n externa (outer join)"
 #: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
-msgstr "<entry>tabla por jerarqu&#x00ed;a de clases</entry>"
+msgstr "tabla por jerarqu&#x00ed;a de clases"
 
 #. Tag: literal
 #: inheritance_mapping.xml:315 inheritance_mapping.xml:326
diff --git a/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot b/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot
index 6dd649b9c7..b0160067d5 100644
--- a/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot
+++ b/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-16 18:47+0000\n"
+"POT-Creation-Date: 2009-06-23 18:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Hibernate_Reference.xml:34
+#: Hibernate_Reference.xml:35
 #, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr ""
 
 #. Tag: subtitle
-#: Hibernate_Reference.xml:35
+#: Hibernate_Reference.xml:36
 #, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr ""
 
 #. Tag: holder
-#: Hibernate_Reference.xml:49
+#: Hibernate_Reference.xml:51
 #, no-c-format
 msgid "&copyrightHolder;"
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/pot/content/configuration.pot b/documentation/manual/src/main/docbook/pot/content/configuration.pot
index 51d5ad5a1e..7662d354c3 100644
--- a/documentation/manual/src/main/docbook/pot/content/configuration.pot
+++ b/documentation/manual/src/main/docbook/pot/content/configuration.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-16 18:47+0000\n"
+"POT-Creation-Date: 2009-06-23 18:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
diff --git a/documentation/manual/src/main/docbook/pot/content/portability.pot b/documentation/manual/src/main/docbook/pot/content/portability.pot
index 71795e39c5..2ebcf32987 100644
--- a/documentation/manual/src/main/docbook/pot/content/portability.pot
+++ b/documentation/manual/src/main/docbook/pot/content/portability.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-16 18:47+0000\n"
+"POT-Creation-Date: 2009-06-23 18:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
@@ -71,7 +71,7 @@ msgstr ""
 #. Tag: para
 #: portability.xml:85
 #, no-c-format
-msgid "The cool part about these resolvers is that users can also register their own custom resolvers which will be processed ahead of the built-in Hibernate ones. This might be useful in a number of different situations: it allows easy integration for auto-detection of dialects beyond those shipped with HIbernate itself; it allows you to specify to use a custom dialect when a particular database is recognized; etc. To register one or more resolvers, simply specify them (seperated by commas, tabs or spaces) using the 'hibernate.dialect_resolvers' configuration setting (see the <constant>DIALECT_RESOLVERS</constant> constant on <classname>org.hibernate.cfgEnvironment</classname>)."
+msgid "The cool part about these resolvers is that users can also register their own custom resolvers which will be processed ahead of the built-in Hibernate ones. This might be useful in a number of different situations: it allows easy integration for auto-detection of dialects beyond those shipped with HIbernate itself; it allows you to specify to use a custom dialect when a particular database is recognized; etc. To register one or more resolvers, simply specify them (seperated by commas, tabs or spaces) using the 'hibernate.dialect_resolvers' configuration setting (see the <constant>DIALECT_RESOLVERS</constant> constant on <classname>org.hibernate.cfg.Environment</classname>)."
 msgstr ""
 
 #. Tag: title
diff --git a/documentation/manual/src/main/docbook/pot/content/preface.pot b/documentation/manual/src/main/docbook/pot/content/preface.pot
index b4e4a17da9..518bc967fb 100644
--- a/documentation/manual/src/main/docbook/pot/content/preface.pot
+++ b/documentation/manual/src/main/docbook/pot/content/preface.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-16 18:47+0000\n"
+"POT-Creation-Date: 2009-06-23 18:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
diff --git a/documentation/manual/src/main/docbook/pot/content/tutorial.pot b/documentation/manual/src/main/docbook/pot/content/tutorial.pot
index 73dc9bd134..d004864f40 100644
--- a/documentation/manual/src/main/docbook/pot/content/tutorial.pot
+++ b/documentation/manual/src/main/docbook/pot/content/tutorial.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-10 21:02+0000\n"
+"POT-Creation-Date: 2009-06-23 18:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
@@ -775,7 +775,7 @@ msgstr ""
 #. Tag: para
 #: tutorial.xml:609
 #, no-c-format
-msgid "Here, we are using a Hibernate Query Language (HQL) query to load all existing <literal>Event</literal> objects from the database. Hibernate will generate the appropriate SQL, send it to the database and populate <literal>Event</literal> objects with the data. You can create more complex queries with HQL. See <xref linkend=\"query-hql\"/> for more information."
+msgid "Here, we are using a Hibernate Query Language (HQL) query to load all existing <literal>Event</literal> objects from the database. Hibernate will generate the appropriate SQL, send it to the database and populate <literal>Event</literal> objects with the data. You can create more complex queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 
 #. Tag: para