[hibernate-commits] Hibernate SVN: r15087 - annotations/trunk/doc/reference/en.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2008-08-15 05:19:46 -0400 (Fri, 15 Aug 2008)
New Revision: 15087

Modified:
   annotations/trunk/doc/reference/en/master.xml
Log:
Updated reface after a request from a translator for clarifications on the last paragraph of the preface.

Modified: annotations/trunk/doc/reference/en/master.xml
===================================================================
--- annotations/trunk/doc/reference/en/master.xml	2008-08-15 06:15:40 UTC (rev 15086)
+++ annotations/trunk/doc/reference/en/master.xml	2008-08-15 09:19:46 UTC (rev 15087)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
 "../support/docbook-dtd/docbookx.dtd" [
 <!ENTITY setup SYSTEM "modules/setup.xml">
@@ -28,38 +28,40 @@
 
     <para>Hibernate, like all other object/relational mapping tools, requires
     metadata that governs the transformation of data from one representation
-    to the other (and vice versa). In Hibernate 2.x, mapping metadata is most
-    of the time declared in XML text files. Another option is XDoclet,
-    utilizing Javadoc source code annotations and a preprocessor at compile
-    time. The same kind of annotation support is now available in the standard
-    JDK, although more powerful and better supported by tools. IntelliJ IDEA,
+    to the other. In Hibernate 2.x mapping metadata is most of the time
+    declared in XML text files. Alternatively XDoclet can be used utilizing
+    Javadoc source code annotations together with a compile time preprocessor.
+    </para>
+
+    <para>The same kind of annotation support is now available in the standard
+    JDK, although more powerful and with better tools support. IntelliJ IDEA
     and Eclipse for example, support auto-completion and syntax highlighting
-    of JDK 5.0 annotations. Annotations are compiled into the bytecode and
-    read at runtime (in Hibernate's case on startup) using reflection, so no
-    external XML files are needed.</para>
+    of JDK 5.0 annotations which are compiled into the bytecode and read at
+    runtime using reflection. No external XML files are needed.</para>
 
     <para>The EJB3 specification recognizes the interest and the success of
-    the transparent object/relational mapping paradigm. The EJB3 specification
-    standardizes the basic APIs and the metadata needed for any
-    object/relational persistence mechanism. <emphasis>Hibernate
-    EntityManager</emphasis> implements the programming interfaces and
-    lifecycle rules as defined by the EJB3 persistence specification. Together
-    with <emphasis>Hibernate Annotations</emphasis>, this wrapper implements a
-    complete (and standalone) EJB3 persistence solution on top of the mature
-    Hibernate core. You may use a combination of all three together,
-    annotations without EJB3 programming interfaces and lifecycle, or even
-    pure native Hibernate, depending on the business and technical needs of
-    your project. You can at all times fall back to Hibernate native APIs, or
-    if required, even to native JDBC and SQL.</para>
+    the transparent object/relational mapping paradigm. It standardizes the
+    basic APIs and the metadata needed for any object/relational persistence
+    mechanism. <emphasis>Hibernate EntityManager</emphasis> implements the
+    programming interfaces and lifecycle rules as defined by the EJB3
+    persistence specification and together with <emphasis>Hibernate
+    Annotations</emphasis> offers a complete (and standalone) EJB3 persistence
+    solution on top of the mature Hibernate core. You may use a combination of
+    all three together, annotations without EJB3 programming interfaces and
+    lifecycle, or even pure native Hibernate, depending on the business and
+    technical needs of your project. At all times you cann fall back to
+    Hibernate native APIs, or if required, even to native JDBC and SQL.</para>
 
-    <para>This release is based on the final release of the EJB 3.0 / JPA
-    specification (aka JSP-220) and support all the specification features
-    (including the optional ones). Most of the Hibernate features and
-    extensions are also available through Hibernate specific annotations
-    compared to the specification are also available. While the Hibernate
-    feature coverage is now very high, some are still missing. The eventual
-    goal is to cover all of them. See the JIRA road map section for more
-    informations.</para>
+    <para>This release of <emphasis>Hibernate Annotations</emphasis> is based
+    on the final release of the EJB 3.0 / JPA specification (aka <link
+    linkend="???"><ulink
+    url="http://jcp.org/en/jsr/detail?id=220">JSR-220</ulink></link>) and
+    supports all its features (including the optional ones). Hibernate
+    specific features and extensions are also available through
+    unstandardized, Hibernate specific annotations. While the Hibernate
+    feature coverage is high, some can not yet be expressed via annotations.
+    The eventual goal is to cover all of them. See the JIRA road map section
+    for more informations.</para>
 
     <para>If you are moving from previous Hibernate Annotations versions,
     please have a look at <ulink url="http://www.hibernate.org/398.html">Java
@@ -73,5 +75,4 @@
   &xml-overriding;
 
   &additionalmodules;
-
 </book>
\ No newline at end of file