From 26bd0a50c83e7a2d9c1bc9f809160e734521fd54 Mon Sep 17 00:00:00 2001
From: Pinaki Poddar <ppoddar@apache.org>
Date: Tue, 20 Apr 2010 15:58:23 +0000
Subject: [PATCH] OPENJPA-1682: Merge doc change from trunk

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@935970 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/doc/manual/jpa_overview_criteria.xml   | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/openjpa-project/src/doc/manual/jpa_overview_criteria.xml b/openjpa-project/src/doc/manual/jpa_overview_criteria.xml
index 437ce2b3c..42e213f53 100644
--- a/openjpa-project/src/doc/manual/jpa_overview_criteria.xml
+++ b/openjpa-project/src/doc/manual/jpa_overview_criteria.xml
@@ -172,7 +172,9 @@ Annotation processor option <code>-Aopenjpa.metamodel=true</code> is specified.
     <programlisting>
  $ javac -classpath path/to/openjpa-all.jar -Aopenjpa.metamodel=true mypackage/MyEntity.java
     </programlisting>
-will generate source code for canonical meta-model class <code>mypackage.MyEntity_.java</code>.
+will generate source code for canonical meta-model class <code>mypackage.MyEntity_</code>.
+The source code is generated relative to the directory specified in <code>-s</code> option
+of <code>javac</code> compiler and defaulted to the current directory.
       </para>
       
       <para>
@@ -206,20 +208,6 @@ the name of a meta-class given the name of the original persistent Java entity c
                By default, adds a OpenJPA proprietary text as comment block.
              </para>
         </listitem>
-        <listitem>
-			<para>
-              -Aout=dir : A directory in the local file system. The generated files will be written 
-              <emphasis>relative</emphasis> to this directory according to the package structure i.e. if <code>dir</code> 
-              is specified as <code>/myproject/generated-src</code> then the generated source code will be 
-              written to <code>/myproject/generated-src/mypackage/MyEntity_.java</code>.
-              If this option is not specified, then an attempt will be made to write the generated source file 
-              in the same directory of the source code of original class <code>mypackage.MyEntity</code>. 
-              The source code location for <code>mypackage.MyEntity</code> can only be determined for Sun JDK6 
-              and when <code>tools.jar</code> being available to the compiler classpath. If the source code 
-              location for the original class can not be determined, and the option is not specified, then the 
-              generated source code is written relative to the current directory according to the package structure.  
-             </para>
-        </listitem>
     </itemizedlist>
        </para>
     </section>