From hibernate-commits at lists.jboss.org Mon Mar  8 11:40:45 2010
Content-Type: multipart/mixed; boundary="===============9041883476239577928=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r18932 -
 core/trunk/annotations/src/main/docbook/en/modules.
Date: Mon, 08 Mar 2010 11:40:45 -0500
Message-ID: <201003081640.o28GejwM013165@svn01.web.mwc.hst.phx2.redhat.com>

--===============9041883476239577928==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: hardy.ferentschik
Date: 2010-03-08 11:40:44 -0500 (Mon, 08 Mar 2010)
New Revision: 18932

Modified:
   core/trunk/annotations/src/main/docbook/en/modules/entity.xml
Log:
HHH-4933 fixed some minor typos

Modified: core/trunk/annotations/src/main/docbook/en/modules/entity.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/annotations/src/main/docbook/en/modules/entity.xml	2010-03-0=
5 22:22:05 UTC (rev 18931)
+++ core/trunk/annotations/src/main/docbook/en/modules/entity.xml	2010-03-0=
8 16:40:44 UTC (rev 18932)
@@ -617,34 +617,32 @@
         <title>Non-annotated property defaults</title>
 =

         <para>If a property is not annotated, the following rules
-        apply:</para>
+        apply:<itemizedlist>
+            <listitem>
+              <para>If the property is of a single type, it is mapped as
+              @Basic</para>
+            </listitem>
 =

-        <itemizedlist>
-          <listitem>
-            <para>If the property is of a single type, it is mapped as
-            @Basic</para>
-          </listitem>
+            <listitem>
+              <para>Otherwise, if the type of the property is annotated as
+              @Embeddable, it is mapped as @Embedded</para>
+            </listitem>
 =

-          <listitem>
-            <para>Otherwise, if the type of the property is annotated as
-            @Embeddable, it is mapped as @Embedded</para>
-          </listitem>
+            <listitem>
+              <para>Otherwise, if the type of the property is
+              <classname>Serializable</classname>, it is mapped as
+              <classname>@Basic</classname> in a column holding the object=
 in
+              its serialized version</para>
+            </listitem>
 =

-          <listitem>
-            <para>Otherwise, if the type of the property is
-            <classname>Serializable</classname>, it is mapped as
-            <classname>@Basic</classname> in a column holding the object in
-            its serialized version</para>
-          </listitem>
-
-          <listitem>
-            <para>Otherwise, if the type of the property is
-            <classname>java.sql.Clob</classname> or
-            <classname>java.sql.Blob</classname>, it is mapped as
-            <classname>@Lob</classname> with the appropriate
-            <classname>LobType</classname></para>
-          </listitem>
-        </itemizedlist>
+            <listitem>
+              <para>Otherwise, if the type of the property is
+              <classname>java.sql.Clob</classname> or
+              <classname>java.sql.Blob</classname>, it is mapped as
+              <classname>@Lob</classname> with the appropriate
+              <classname>LobType</classname></para>
+            </listitem>
+          </itemizedlist></para>
       </section>
     </section>
 =

@@ -746,7 +744,7 @@
          </programlisting>
 =

         <para>If JPA XML (like <filename>META-INF/orm.xml</filename>) is u=
sed
-        to define thegenerators, <literal>EMP_GEN</literal> and
+        to define the generators, <literal>EMP_GEN</literal> and
         <literal>SEQ_GEN</literal> are application level generators.
         <literal>EMP_GEN</literal> defines a table based id generator using
         the hilo algorithm with a <literal>max_lo</literal> of 20. The hi
@@ -1005,7 +1003,7 @@
         <section>
           <title>Multiple @Id properties</title>
 =

-          <para>Another arguably more natural) approach is to place
+          <para>Another, arguably more natural, approach is to place
           <classname>@Id</classname> on multiple properties of my entity. =
This
           approach is only supported by Hibernate but does not require an
           extra embeddable component.</para>


--===============9041883476239577928==--