Author: steve.ebersole(a)jboss.com Date: 2007-10-25 02:31:49 -0400 (Thu, 25 Oct 2007) New Revision: 14130 Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/basic_mapping.xml core/trunk/documentation/manual/en-US/src/main/docbook/content/batch.xml core/trunk/documentation/manual/en-US/src/main/docbook/content/configuration.xml core/trunk/documentation/manual/en-US/src/main/docbook/content/query_hql.xml core/trunk/documentation/manual/en-US/src/main/docbook/content/query_sql.xml core/trunk/documentation/manual/en-US/src/main/docbook/content/transactions.xml Log: correct various docbook markup issues Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/basic_mapping.xml =================================================================== --- core/trunk/documentation/manual/en-US/src/main/docbook/content/basic_mapping.xml 2007-10-25 05:21:21 UTC (rev 14129) +++ core/trunk/documentation/manual/en-US/src/main/docbook/content/basic_mapping.xml 2007-10-25 06:31:49 UTC (rev 14130) @@ -159,7 +159,7 @@ </hibernate-mapping>]]></programlisting> <para> Where <literal>types.xml</literal> is a resource in the <literal>your.domain</literal> - package and contains a custom <xref linkend="mapping-types-custom">typedef</xref>. + package and contains a custom <link linkend="mapping-types-custom">typedef</link>. </para> </sect3> </sect2> @@ -1358,7 +1358,7 @@ <para> <literal>generated</literal> (optional - defaults to <literal>never</literal>): Specifies that this version property value is actually generated by the database. - See the discussion of <xref linkend="mapping-generated">generated properties</xref>. + See the discussion of <link linkend="mapping-generated">generated properties</link>. </para> </callout> <callout arearefs="version7"> @@ -1460,7 +1460,7 @@ <para> <literal>generated</literal> (optional - defaults to <literal>never</literal>): Specifies that this timestamp property value is actually generated by the database. - See the discussion of <xref linkend="mapping-generated">generated properties</xref>. + See the discussion of <link linkend="mapping-generated">generated properties</link>. </para> </callout> </calloutlist> @@ -1593,7 +1593,7 @@ <para> <literal>generated</literal> (optional - defaults to <literal>never</literal>): Specifies that this property value is actually generated by the database. - See the discussion of <xref linkend="mapping-generated">generated properties</xref>. + See the discussion of <link linkend="mapping-generated">generated properties</link>. </para> </callout> </calloutlist> @@ -3490,9 +3490,9 @@ </para> <para> Properties marked as generated must additionally be non-insertable and non-updateable. - Only <xref linkend="mapping-declaration-version">versions</xref>, - <xref linkend="mapping-declaration-timestamp">timestamps</xref>, and - <xref linkend="mapping-declaration-property">simple properties</xref> can be marked as + Only <link linkend="mapping-declaration-version">versions</link>, + <link linkend="mapping-declaration-timestamp">timestamps</link>, and + <link linkend="mapping-declaration-property">simple properties</link> can be marked as generated. </para> <para> @@ -3503,8 +3503,8 @@ <literal>insert</literal> - states that the given property value is generated on insert, but is not regenerated on subsequent updates. Things like created-date would fall into this category. Note that even thought - <xref linkend="mapping-declaration-version">version</xref> and - <xref linkend="mapping-declaration-timestamp">timestamp</xref> properties can + <link linkend="mapping-declaration-version">version</link> and + <link linkend="mapping-declaration-timestamp">timestamp</link> properties can be marked as generated, this option is not available there... </para> <para> Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/batch.xml =================================================================== --- core/trunk/documentation/manual/en-US/src/main/docbook/content/batch.xml 2007-10-25 05:21:21 UTC (rev 14129) +++ core/trunk/documentation/manual/en-US/src/main/docbook/content/batch.xml 2007-10-25 06:31:49 UTC (rev 14130) @@ -167,7 +167,7 @@ (DML) statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>) data directly in the database will not affect in-memory state. However, Hibernate provides methods for bulk SQL-style DML statement execution which are performed through the - Hibernate Query Language (<xref linkend="queryhql">HQL</xref>). + Hibernate Query Language (<link linkend="queryhql">HQL</link>). </para> <para> @@ -192,7 +192,7 @@ </listitem> <listitem> <para> - No <xref linkend="queryhql-joins-forms">joins</xref> (either implicit or explicit) + No <link linkend="queryhql-joins-forms">joins</link> (either implicit or explicit) can be specified in a bulk HQL query. Sub-queries may be used in the where-clause; the subqueries, themselves, may contain joins. </para> @@ -224,8 +224,8 @@ <para> HQL <literal>UPDATE</literal> statements, by default do not effect the - <xref linkend="mapping-declaration-version">version</xref> - or the <xref linkend="mapping-declaration-timestamp">timestamp</xref> property values + <link linkend="mapping-declaration-version">version</link> + or the <link linkend="mapping-declaration-timestamp">timestamp</link> property values for the affected entities; this is in keeping with the EJB3 specification. However, you can force Hibernate to properly reset the <literal>version</literal> or <literal>timestamp</literal> property values through the use of a <literal>versioned update</literal>. Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/configuration.xml =================================================================== --- core/trunk/documentation/manual/en-US/src/main/docbook/content/configuration.xml 2007-10-25 05:21:21 UTC (rev 14129) +++ core/trunk/documentation/manual/en-US/src/main/docbook/content/configuration.xml 2007-10-25 06:31:49 UTC (rev 14130) @@ -717,19 +717,19 @@ </row> <row> <entry> - <literal>hibernate.connection.<emphasis>&lt;propertyName&gt;</emphasis></literal> + <literal>hibernate.connection.</literal><emphasis>&lt;propertyName&gt;</emphasis> </entry> <entry> - Pass the JDBC property <literal>propertyName</literal> + Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to <literal>DriverManager.getConnection()</literal>. </entry> </row> <row> <entry> - <literal>hibernate.jndi.<emphasis>&lt;propertyName&gt;</emphasis></literal> + <literal>hibernate.jndi.</literal><emphasis>&lt;propertyName&gt;</emphasis> </entry> <entry> - Pass the property <literal>propertyName</literal> to + Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the JNDI <literal>InitialContextFactory</literal>. </entry> </row> @@ -1646,7 +1646,7 @@ <para> The easiest way to handle <literal>Session</literal>s and transactions is Hibernates automatic "current" <literal>Session</literal> management. - See the discussion of <xref linkend="architecture-current-session">current sessions</xref>. + See the discussion of <link linkend="architecture-current-session">current sessions</link>. Using the <literal>"jta"</literal> session context, if there is no Hibernate <literal>Session</literal> associated with the current JTA transaction, one will be started and associated with that JTA transaction the first time you call Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/query_hql.xml =================================================================== --- core/trunk/documentation/manual/en-US/src/main/docbook/content/query_hql.xml 2007-10-25 05:21:21 UTC (rev 14129) +++ core/trunk/documentation/manual/en-US/src/main/docbook/content/query_hql.xml 2007-10-25 06:31:49 UTC (rev 14130) @@ -529,7 +529,7 @@ <para> You may also use components or composite user types, or properties of said - component types. See <xref linkend="queryhql-coomponents"/> for more details. + component types. See <xref linkend="queryhql-components"/> for more details. </para> <para> @@ -1187,7 +1187,7 @@ <programlisting><![CDATA[from from Person p order by p.name.first]]></programlisting> <para> - Another common use of components is in <xref linkend="queryhql-tuple">row value constructors</xref>. + Another common use of components is in <link linkend="queryhql-tuple">row value constructors</link>. </para> </sect1> Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/query_sql.xml =================================================================== --- core/trunk/documentation/manual/en-US/src/main/docbook/content/query_sql.xml 2007-10-25 05:21:21 UTC (rev 14129) +++ core/trunk/documentation/manual/en-US/src/main/docbook/content/query_sql.xml 2007-10-25 06:31:49 UTC (rev 14130) @@ -154,11 +154,11 @@ .addJoin("cat.dogs"); ]]></programlisting> - <p>At this stage we are reaching the limits of what is possible with - native queries without starting to enhance the sql queries to make them - usable in Hibernate; the problems starts to arise when returning - multiple entities of the same type or when the default alias/column - names are not enough.</p> + <para> + At this stage we are reaching the limits of what is possible with native queries without starting to + enhance the sql queries to make them usable in Hibernate; the problems starts to arise when returning + multiple entities of the same type or when the default alias/column names are not enough. + </para> </sect2> <sect2> Modified: core/trunk/documentation/manual/en-US/src/main/docbook/content/transactions.xml =================================================================== --- core/trunk/documentation/manual/en-US/src/main/docbook/content/transactions.xml 2007-10-25 05:21:21 UTC (rev 14129) +++ core/trunk/documentation/manual/en-US/src/main/docbook/content/transactions.xml 2007-10-25 06:31:49 UTC (rev 14130) @@ -441,7 +441,7 @@ <para> You don't have to <literal>flush()</literal> the <literal>Session</literal> explicitly - the call to <literal>commit()</literal> automatically triggers the synchronization (depending - upon the <xref linkend="objectstate-flushing">FlushMode</xref> for the session. + upon the <link linkend="objectstate-flushing">FlushMode</link> for the session. A call to <literal>close()</literal> marks the end of a session. The main implication of <literal>close()</literal> is that the JDBC connection will be relinquished by the session. This Java code is portable and runs in both non-managed and JTA environments.