Author: stliu Date: 2010-06-28 05:52:43 -0400 (Mon, 28 Jun 2010) New Revision: 19830 Modified: core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/configuration.xml Log: HHH-5340 Typo in tutorial at web site Modified: core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml =================================================================== --- core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-06-28 09:47:17 UTC (rev 19829) +++ core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-06-28 09:52:43 UTC (rev 19830) @@ -1113,7 +1113,7 @@ node="element-name|." <key-property name="propertyName" type="typename" column="column_name"/> - <key-many-to-one name="propertyName class="ClassName" column="column_name"/> + <key-many-to-one name="propertyName" class="ClassName" column="column_name"/> ...... </composite-id>]]></programlisting> @@ -1856,7 +1856,7 @@ associated object. The meaningful values are divided into three categories. First, basic operations, which include: <literal>persist, merge, delete, save-update, evict, replicate, lock and refresh</literal>; second, special values: <literal>delete-orphan</literal>; - and third,<literal>all</literal> comma-separated combinations of operation + and third, <literal>all</literal> comma-separated combinations of operation names: <literal>cascade="persist,merge,evict"</literal> or <literal>cascade="all,delete-orphan"</literal>. See <xref linkend="objectstate-transitive"/> for a full explanation. Note that single valued, many-to-one and Modified: core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/configuration.xml =================================================================== --- core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/configuration.xml 2010-06-28 09:47:17 UTC (rev 19829) +++ core/branches/Branch_3_5/documentation/manual/src/main/docbook/en-US/content/configuration.xml 2010-06-28 09:52:43 UTC (rev 19830) @@ -604,7 +604,7 @@ </entry> <entry> Set this property to <literal>true</literal> if your JDBC driver returns - correct row counts from <literal>executeBatch()</literal>. Iit is usually + correct row counts from <literal>executeBatch()</literal>. It is usually safe to turn this option on. Hibernate will then use batched DML for automatically versioned data. Defaults to <literal>false</literal>. <para> @@ -1674,7 +1674,7 @@ <literal>Session</literal> associated with the current JTA transaction, one will be started and associated with that JTA transaction the first time you call <literal>sessionFactory.getCurrentSession()</literal>. The <literal>Session</literal>s - retrieved via <literal>getCurrentSession()</literal> in the<literal>"jta"</literal> context + retrieved via <literal>getCurrentSession()</literal> in the <literal>"jta"</literal> context are set to automatically flush before the transaction completes, close after the transaction completes, and aggressively release JDBC connections after each statement. This allows the <literal>Session</literal>s to