diff --git a/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml
index 70e780dd1c..656935c437 100644
--- a/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml
+++ b/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml
@@ -585,7 +585,7 @@ create table Address ( addressId bigint not null primary key )
     </property>
 </properties>
 <property name="effectiveEndDate" type="date"/>
-<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
 
         <para>
             alors nous pouvons mapper une association à l'instance <emphasis>courante</emphasis>  
diff --git a/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml
index e6e8fd2c8c..e333b9cd4b 100644
--- a/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml
+++ b/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <chapter id="associations">
 
@@ -574,7 +574,7 @@ create table Address ( addressId bigint not null primary key )
     </property>
 </properties>
 <property name="effectiveEndDate" type="date"/>
-<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
 
         <para>
             そして、関連を <emphasis>現時点の</emphasis> インスタンス
diff --git a/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml
index 3c588417fe..ccaf3e58ff 100644
--- a/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml
+++ b/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml
@@ -560,7 +560,7 @@ create table Address ( addressId bigint not null primary key )
     </property>
 </properties>
 <property name="effectiveEndDate" type="date"/>
-<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
 
         <para>
                         그때 우리는 다음을 사용하여 하나의 연관을 <emphasis>현재</emphasis> 인스턴스
diff --git a/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml
index 75199d4d9e..457d72a4fa 100755
--- a/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml
+++ b/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
 <chapter id="associations">
 
     <title>Mapeamento de Associações</title>
@@ -588,7 +588,7 @@ Joins de associações mais complexas são extremamente raros. O Hibernate torna
     </property>
 </properties>
 <property name="effectiveEndDate" type="date"/>
-<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
 
         <para>
             Then we can map an association to the <emphasis>current</emphasis> instance 
diff --git a/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml b/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml
index 7b3d4b8ff1..66d2aa0e1a 100755
--- a/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml
+++ b/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
 <chapter id="tutorial">
     <title>Introdu&#x00E7;&#x00E3;o ao Hibernate</title>
     
@@ -1444,7 +1444,7 @@ out.close();]]></programlisting>
                 That's it, the servlet is complete. A request to the servlet will be processed
                 in a single <literal>Session</literal> and <literal>Transaction</literal>. As
                 earlier in the standalone application, Hibernate can automatically bind these
-                objects to the current thread of execution. This gives you the freedom to layer
+                ojects to the current thread of execution. This gives you the freedom to layer
                 your code and access the <literal>SessionFactory</literal> in any way you like.
                 Usually you'd use a more sophisticated design and move the data access code
                 into data access objects (the DAO pattern). See the Hibernate Wiki for more
diff --git a/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml
index df6b82a9aa..ca62c9e612 100644
--- a/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml
+++ b/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml
@@ -541,7 +541,7 @@ create table Address ( addressId bigint not null primary key )
     </property>
 </properties>
 <property name="effectiveEndDate" type="date"/>
-<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
 
         <para>
         那么我们可以对<emphasis>目前(current)</emphasis>实例(其<literal>effectiveEndDate</literal>为null)使用这样的关联映射:
diff --git a/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
index 6cb44e827d..e57d361d38 100755
--- a/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
@@ -603,7 +603,7 @@ create table Address ( addressId bigint not null primary key )
     </property>
 </properties>
 <property name="effectiveEndDate" type="date"/>
-<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
 
         <para>
             Then we can map an association to the <emphasis>current</emphasis> instance 
diff --git a/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
index e81c221ca4..436a02852b 100644
--- a/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
@@ -126,7 +126,7 @@
         <para>
             Like all value types, components do not support shared references. In other words, two
             persons could have the same name, but the two person objects would contain two independent
-            name objects, only "the same" by value. The null value semantics of a component are
+            name ojects, only "the same" by value. The null value semantics of a component are
             <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume
             that if all component columns are null, then the entire component is null. This should
             be okay for most purposes.
diff --git a/documentation/manual/src/main/docbook/en-US/content/query_sql.xml b/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
index 0c976615e3..e36876d9f1 100644
--- a/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
@@ -238,9 +238,9 @@ sess.createSQLQuery("SELECT ID, NAME, BIRTHDATE FROM CATS").addEntity(Cat.class)
       declared in the mapping metadata. Notice that we may even use the
       property aliases in the where clause if we like.</para>
 
-      <programlisting><![CDATA[String sql = "SELECT ID as {cat.id}, NAME as {cat.name}, " + 
-         "BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +
-         "FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID";
+      <programlisting><![CDATA[String sql = "SELECT ID as {c.id}, NAME as {c.name}, " + 
+         "BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} " +
+         "FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID";
 
 List loggedCats = sess.createSQLQuery(sql)
         .addEntity("cat", Cat.class)
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 e7cf2758ee..e2dfa9c05a 100644
--- a/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
@@ -1566,9 +1566,8 @@ out.close();]]></programlisting>
 
             <para>
                 Before you compile and deploy the web application, note that an additional library
-                is required: <literal>servlet.jar</literal>. This is the Java Servlet Development Kit,
-                if you don't have this library already, get it from the 
-                <ulink url="http://java.sun.com/products/servlet/archive.html">Sun website</ulink> and copy it to
+                is required: <literal>jsdk.jar</literal>. This is the Java servlet development kit,
+                if you don't have this library already, get it from the Sun website and copy it to
                 your library directory. However, it will be only used for compilation and excluded
                 from the WAR package.
             </para>
diff --git a/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po b/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
index e648903357..630b54d449 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
@@ -1028,7 +1028,7 @@ msgid ""
 "    </property>\n"
 "</properties>\n"
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
 "                            <property name=\"accountNumber\" type=\"string\" "
@@ -1040,7 +1040,7 @@ msgstr ""
 "                            </property>\n"
 "                    </properties>\n"
 "                    <property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"                    <property name=\"effectiveStartDate\" type=\"date\" not-"
+"                    <property name=\"effectiveStateDate\" type=\"date\" not-"
 "null=\"true\"/>]]>"
 
 #: index.docbook:266
diff --git a/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po b/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
index 9b5e6d5b15..ae80327df3 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
@@ -197,7 +197,7 @@ msgstr ""
 msgid ""
 "Like all value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name objects, only \"the same\" by value. The "
+"would contain two independent name ojects, only \"the same\" by value. The "
 "null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
 "reloading the containing object, Hibernate will assume that if all component "
 "columns are null, then the entire component is null. This should be okay for "
diff --git a/documentation/manual/src/main/docbook/es-ES/content/query_sql.po b/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
index 77a765d0d8..cf682310df 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
@@ -439,21 +439,21 @@ msgstr ""
 
 #: index.docbook:192
 msgid ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
 "\" +\n"
-"         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "\n"
 "List loggedCats = sess.createSQLQuery(sql)\n"
 "        .addEntity(\"cat\", Cat.class)\n"
 "        .addEntity(\"mother\", Cat.class).list()\n"
 "]]>"
 msgstr ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"                                                    \"BIRTHDATE as {cat."
-"birthDate}, MOTHER_ID as {cat.mother}, {mother.*} \" +\n"
-"                                                    \"FROM CAT_LOG cat, "
-"CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"                                                    \"BIRTHDATE as {c."
+"birthDate}, MOTHER_ID as {c.mother}, {mother.*} \" +\n"
+"                                                    \"FROM CAT_LOG c, "
+"CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "                                                    \n"
 "                                                    List loggedCats = sess."
 "createSQLQuery(sql)\n"
diff --git a/documentation/manual/src/main/docbook/es-ES/content/transactions.po b/documentation/manual/src/main/docbook/es-ES/content/transactions.po
index 687de87b14..6c8e0ee5ec 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/transactions.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/transactions.po
@@ -1464,7 +1464,7 @@ msgstr ""
 msgid ""
 "Clearly, manual version checking is only feasible in very trivial "
 "circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
+"instances, but complete graphs of modified ojects have to be checked. "
 "Hibernate offers automatic version checking with either an extended "
 "<literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/es-ES/content/tutorial.po b/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
index 8ca095f65c..ceab1e83fe 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
@@ -2936,7 +2936,7 @@ msgid ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "
@@ -2945,7 +2945,7 @@ msgstr ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po b/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
index 0ec25e442f..d847935af1 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
@@ -838,7 +838,7 @@ msgid ""
 "    </property>\n"
 "</properties>\n"
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po b/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
index c753e626f7..a5b7ee8626 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
@@ -164,7 +164,7 @@ msgstr ""
 msgid ""
 "Like all value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name objects, only \"the same\" by value. The "
+"would contain two independent name ojects, only \"the same\" by value. The "
 "null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
 "reloading the containing object, Hibernate will assume that if all component "
 "columns are null, then the entire component is null. This should be okay for "
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po b/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
index 690e3fe992..6f77508611 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
@@ -476,10 +476,10 @@ msgstr ""
 #: query_sql.xml:192
 #, no-c-format
 msgid ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
 "\" +\n"
-"         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "\n"
 "List loggedCats = sess.createSQLQuery(sql)\n"
 "        .addEntity(\"cat\", Cat.class)\n"
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/transactions.po b/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
index ef41f3d28a..ed50b05b1c 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
@@ -1494,7 +1494,7 @@ msgstr ""
 msgid ""
 "Clearly, manual version checking is only feasible in very trivial "
 "circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
+"instances, but complete graphs of modified ojects have to be checked. "
 "Hibernate offers automatic version checking with either an extended "
 "<literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po b/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
index bdf3cbfdd0..31d56089fa 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
@@ -2669,7 +2669,7 @@ msgid ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po b/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
index ffbe32ec1b..f65d7770a1 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
@@ -801,7 +801,7 @@ msgid ""
 "    </property>\n"
 "</properties>\n"
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po b/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
index c848c602d6..d2a41e65ac 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
@@ -162,7 +162,7 @@ msgstr ""
 msgid ""
 "Like all value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name objects, only \"the same\" by value. The "
+"would contain two independent name ojects, only \"the same\" by value. The "
 "null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
 "reloading the containing object, Hibernate will assume that if all component "
 "columns are null, then the entire component is null. This should be okay for "
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po b/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
index cf2ddca4ed..ec75aebf79 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
@@ -465,10 +465,10 @@ msgstr ""
 #: query_sql.xml:192
 #, no-c-format
 msgid ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
 "\" +\n"
-"         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "\n"
 "List loggedCats = sess.createSQLQuery(sql)\n"
 "        .addEntity(\"cat\", Cat.class)\n"
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/transactions.po b/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
index dc3242332d..ffc29ed99a 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
@@ -1418,7 +1418,7 @@ msgstr ""
 msgid ""
 "Clearly, manual version checking is only feasible in very trivial "
 "circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
+"instances, but complete graphs of modified ojects have to be checked. "
 "Hibernate offers automatic version checking with either an extended "
 "<literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po b/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
index 8775803825..bbea79e3a6 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
@@ -2598,7 +2598,7 @@ msgid ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "
diff --git a/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po b/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
index 8c6ee1f91f..5bb63d3f59 100644
--- a/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
+++ b/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
@@ -811,7 +811,7 @@ msgid ""
 "    </property>\n"
 "</properties>\n"
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po b/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
index 98232a6887..eec938d9f4 100644
--- a/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
+++ b/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
@@ -162,7 +162,7 @@ msgstr ""
 msgid ""
 "Like all value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name objects, only \"the same\" by value. The "
+"would contain two independent name ojects, only \"the same\" by value. The "
 "null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
 "reloading the containing object, Hibernate will assume that if all component "
 "columns are null, then the entire component is null. This should be okay for "
diff --git a/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po b/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
index b56581de6b..f5e0d19e1d 100644
--- a/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
+++ b/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
@@ -466,10 +466,10 @@ msgstr ""
 #: query_sql.xml:192
 #, no-c-format
 msgid ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
 "\" +\n"
-"         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "\n"
 "List loggedCats = sess.createSQLQuery(sql)\n"
 "        .addEntity(\"cat\", Cat.class)\n"
diff --git a/documentation/manual/src/main/docbook/ko-KR/content/transactions.po b/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
index 49a046cdaa..f8836a0d4f 100644
--- a/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
+++ b/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid ""
 "Clearly, manual version checking is only feasible in very trivial "
 "circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
+"instances, but complete graphs of modified ojects have to be checked. "
 "Hibernate offers automatic version checking with either an extended "
 "<literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po b/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
index d3ac3ad6ab..8f76844b9b 100644
--- a/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
+++ b/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
@@ -2616,7 +2616,7 @@ msgid ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "
diff --git a/documentation/manual/src/main/docbook/pot/content/association_mapping.pot b/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
index 771cf6c7d8..d4a70b3a6b 100644
--- a/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
+++ b/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
@@ -685,7 +685,7 @@ msgid ""
       "    </property>\n"
       "</properties>\n"
       "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-      "<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+      "<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/pot/content/component_mapping.pot b/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
index f8d7ca47b6..c244ba2e03 100644
--- a/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
+++ b/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
@@ -136,7 +136,7 @@ msgstr ""
 #. Tag: para
 #: component_mapping.xml:70
 #, no-c-format
-msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name objects, only \"the same\" by value. The null value semantics of a component are <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes."
+msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name ojects, only \"the same\" by value. The null value semantics of a component are <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes."
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/pot/content/query_sql.pot b/documentation/manual/src/main/docbook/pot/content/query_sql.pot
index 5c2ed027de..5b48597681 100644
--- a/documentation/manual/src/main/docbook/pot/content/query_sql.pot
+++ b/documentation/manual/src/main/docbook/pot/content/query_sql.pot
@@ -310,9 +310,9 @@ msgstr ""
 #: query_sql.xml:216
 #, no-c-format
 msgid ""
-      "<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-      "         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} \" +\n"
-      "         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+      "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+      "         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} \" +\n"
+      "         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
       "\n"
       "List loggedCats = sess.createSQLQuery(sql)\n"
       "        .addEntity(\"cat\", Cat.class)\n"
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po b/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
index 2cb8238ab6..b92a76e581 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
@@ -833,7 +833,7 @@ msgid ""
 "    </property>\n"
 "</properties>\n"
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po b/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
index 0c1533e0e5..5fc6048ef3 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
@@ -162,7 +162,7 @@ msgstr ""
 msgid ""
 "Like all value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name objects, only \"the same\" by value. The "
+"would contain two independent name ojects, only \"the same\" by value. The "
 "null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
 "reloading the containing object, Hibernate will assume that if all component "
 "columns are null, then the entire component is null. This should be okay for "
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po b/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
index 69c9bb3693..ec64d826b4 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
@@ -474,10 +474,10 @@ msgstr ""
 #: query_sql.xml:192
 #, no-c-format
 msgid ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
 "\" +\n"
-"         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "\n"
 "List loggedCats = sess.createSQLQuery(sql)\n"
 "        .addEntity(\"cat\", Cat.class)\n"
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/transactions.po b/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
index 4cfb29da2c..1de742067d 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
@@ -1454,7 +1454,7 @@ msgstr ""
 msgid ""
 "Clearly, manual version checking is only feasible in very trivial "
 "circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
+"instances, but complete graphs of modified ojects have to be checked. "
 "Hibernate offers automatic version checking with either an extended "
 "<literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po b/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
index 4981ab7127..e3bf7303c9 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
@@ -2652,7 +2652,7 @@ msgid ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po b/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
index a4c451b714..4682f44b95 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
@@ -802,7 +802,7 @@ msgid ""
 "    </property>\n"
 "</properties>\n"
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po b/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
index 4ffaa8b4c9..8ea7025844 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
@@ -161,7 +161,7 @@ msgstr ""
 msgid ""
 "Like all value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name objects, only \"the same\" by value. The "
+"would contain two independent name ojects, only \"the same\" by value. The "
 "null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
 "reloading the containing object, Hibernate will assume that if all component "
 "columns are null, then the entire component is null. This should be okay for "
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po b/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
index abefb5e9b3..fd20bab74e 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
@@ -452,10 +452,10 @@ msgstr ""
 #: query_sql.xml:192
 #, no-c-format
 msgid ""
-"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
-"         \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
+"         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
 "\" +\n"
-"         \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
+"         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
 "\n"
 "List loggedCats = sess.createSQLQuery(sql)\n"
 "        .addEntity(\"cat\", Cat.class)\n"
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/transactions.po b/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
index b5f0e142f3..f3e8c10203 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
@@ -1318,7 +1318,7 @@ msgstr ""
 msgid ""
 "Clearly, manual version checking is only feasible in very trivial "
 "circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
+"instances, but complete graphs of modified ojects have to be checked. "
 "Hibernate offers automatic version checking with either an extended "
 "<literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po b/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
index 434767d0c4..1d39c38b09 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
@@ -2496,7 +2496,7 @@ msgid ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
 "literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
+"automatically bind these ojects to the current thread of execution. This "
 "gives you the freedom to layer your code and access the "
 "<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
 "more sophisticated design and move the data access code into data access "