HHH-6082 - Incorporate EntityManager documentation into main dev guide

hibernate · Feb 7, 2012 · 955f21e · 955f21e
1 parent 9b30494
commit 955f21e
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/documentation/src/main/docbook/devguide/en-US/Transactions.xml b/documentation/src/main/docbook/devguide/en-US/Transactions.xml
@@ -63,11 +63,21 @@
                     are used to allow applications to manage and check the state of transactions.
                     <interfacename>org.hibernate.Transaction</interfacename> is Hibernate's notion of a logical
                     transaction.  JPA has a similar notion in the
-                    <interfacename>javax.persistence.EntityTransaction</interfacename> interface.
+                    <interfacename>javax.persistence.EntityTransaction</interfacename> interface although it is only
+                    available when using resource-local transactions, whereas access to
+                    <interfacename>org.hibernate.Transaction</interfacename> is always allowed.
                 </para>
             </listitem>
         </itemizedlist>
 
+        <note>
+            <para>
+                <interfacename>javax.persistence.EntityTransaction</interfacename> is only available when using
+                resource-local transactions.  Hibernate allows access to
+                <interfacename>org.hibernate.Transaction</interfacename> regardless of environment.
+            </para>
+        </note>
+
         <para>
             <interfacename>org.hibernate.engine.transaction.spi.TransactionFactory</interfacename> is a standard
             Hibernate service.  See <xref linkend="services-TransactionFactory"/> for details.