diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
index b98eed814..7e3b0bcd0 100644
--- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
+++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
@@ -7,7 +7,7 @@
     version="2.0">
     <xsd:annotation>
         <xsd:documentation>
-            @(#)orm_2_0.xsd 2.0 May 27 2009
+            @(#)orm_2_0.xsd 2.0 July 17 2009
         </xsd:documentation>
     </xsd:annotation>
     <xsd:annotation>
@@ -270,12 +270,13 @@ version="2.0">
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="description" type="xsd:string"
-                minOccurs="0" />
-            <xsd:element name="join-column" type="orm:join-column"
-                minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="join-table" type="orm:join-table"
-                minOccurs="0" />
+            <xsd:element name="description" type="xsd:string" minOccurs="0" />
+            <xsd:choice>
+                <xsd:element name="join-column" type="orm:join-column"
+                    minOccurs="0" maxOccurs="unbounded" />
+                <xsd:element name="join-table" type="orm:join-table"
+                    minOccurs="0" />
+            </xsd:choice>
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
@@ -369,7 +370,8 @@ version="2.0">
     <xsd:complexType name="cascade-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
+                public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH,
+                DETACH};
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -383,6 +385,8 @@ version="2.0">
                 minOccurs="0" />
             <xsd:element name="cascade-refresh" type="orm:emptyType"
                 minOccurs="0" />
+            <xsd:element name="cascade-detach" type="orm:emptyType"
+                minOccurs="0" />
         </xsd:sequence>
     </xsd:complexType>
     <!-- **************************************************** -->
diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc
index f3dc44338..4779aec1e 100644
--- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc
+++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_2_0-xsd.rsrc
@@ -7,7 +7,7 @@
     version="2.0">
     <xsd:annotation>
         <xsd:documentation>
-            @(#)persistence_2_0.xsd 1.0 May 8 2009
+            @(#)persistence_2_0.xsd 1.0 July 17 2009
         </xsd:documentation>
     </xsd:annotation>
     <xsd:annotation>
@@ -102,8 +102,7 @@ version="2.0">
                                 maxOccurs="unbounded">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        Jar file that should be scanned for entities.
-                                        Not applicable to Java SE persistence units.
+                                        Jar file that is to be scanned for managed classes.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -112,14 +111,15 @@ version="2.0">
                                 minOccurs="0" maxOccurs="unbounded">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        Class to scan for annotations. It should be annotated
+                                        Managed class to be included in the persistence unit and
+                                        to scan for annotations. It should be annotated
                                         with either @Entity, @Embeddable or @MappedSuperclass.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
                             <!-- **************************************************** -->
                             <xsd:element name="exclude-unlisted-classes"
-                                type="xsd:boolean" default="false"
+                                type="xsd:boolean" default="true"
                                 minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
@@ -154,8 +154,7 @@ version="2.0">
                                 minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        Specifies the validation mode to be used for the
-                                        persistence unit.
+                                        The validation mode to be used for the persistence unit.
                                     </xsd:documentation>
                                 </xsd:annotation>
                             </xsd:element>
@@ -164,7 +163,8 @@ version="2.0">
                                 minOccurs="0">
                                 <xsd:annotation>
                                     <xsd:documentation>
-                                        A list of vendor-specific properties.
+                                        A list of standard and vendor-specific properties
+                                        and hints.
                                     </xsd:documentation>
                                 </xsd:annotation>
                                 <xsd:complexType>
@@ -219,7 +219,7 @@ version="2.0">
     <xsd:simpleType name="persistence-unit-transaction-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum TransactionType { JTA, RESOURCE_LOCAL };
+                public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
@@ -231,7 +231,7 @@ version="2.0">
     <xsd:simpleType name="persistence-unit-caching-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
+                public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE,
                 DISABLE_SELECTIVE, UNSPECIFIED};
             </xsd:documentation>
         </xsd:annotation>
diff --git a/openjpa-project/src/doc/manual/jpa_overview_meta.xml b/openjpa-project/src/doc/manual/jpa_overview_meta.xml
index e13705897..f0008ccff 100644
--- a/openjpa-project/src/doc/manual/jpa_overview_meta.xml
+++ b/openjpa-project/src/doc/manual/jpa_overview_meta.xml
@@ -2042,7 +2042,7 @@ found at <ulink url="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"/>.
     version="2.0"&gt;
     &lt;xsd:annotation&gt;
         &lt;xsd:documentation&gt;
-            @(#)orm_2_0.xsd 2.0 May 27 2009
+            @(#)orm_2_0.xsd 2.0 July 17 2009
         &lt;/xsd:documentation&gt;
     &lt;/xsd:annotation&gt;
     &lt;xsd:annotation&gt;
@@ -2307,12 +2307,13 @@ found at <ulink url="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"/>.
             &lt;/xsd:documentation&gt;
         &lt;/xsd:annotation&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name="description" type="xsd:string"
-                minOccurs="0" /&gt;
-            &lt;xsd:element name="join-column" type="orm:join-column"
-                minOccurs="0" maxOccurs="unbounded" /&gt;
-            &lt;xsd:element name="join-table" type="orm:join-table"
-                minOccurs="0" /&gt;
+            &lt;xsd:element name="description" type="xsd:string" minOccurs="0" /&gt;
+            &lt;xsd:choice&gt;
+                &lt;xsd:element name="join-column" type="orm:join-column"
+                    minOccurs="0" maxOccurs="unbounded" /&gt;
+                &lt;xsd:element name="join-table" type="orm:join-table"
+                    minOccurs="0" /&gt;
+            &lt;/xsd:choice&gt;
         &lt;/xsd:sequence&gt;
         &lt;xsd:attribute name="name" type="xsd:string" use="required" /&gt;
     &lt;/xsd:complexType&gt;
@@ -2406,7 +2407,8 @@ found at <ulink url="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"/>.
     &lt;xsd:complexType name="cascade-type"&gt;
         &lt;xsd:annotation&gt;
             &lt;xsd:documentation&gt;
-                public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
+                public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH,
+                DETACH};
             &lt;/xsd:documentation&gt;
         &lt;/xsd:annotation&gt;
         &lt;xsd:sequence&gt;
@@ -2420,6 +2422,8 @@ found at <ulink url="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"/>.
                 minOccurs="0" /&gt;
             &lt;xsd:element name="cascade-refresh" type="orm:emptyType"
                 minOccurs="0" /&gt;
+            &lt;xsd:element name="cascade-detach" type="orm:emptyType"
+                minOccurs="0" /&gt;
         &lt;/xsd:sequence&gt;
     &lt;/xsd:complexType&gt;
     &lt;!-- **************************************************** --&gt;
diff --git a/openjpa-project/src/doc/manual/jpa_overview_persistence.xml b/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
index 97ca8f56b..3d6517e50 100644
--- a/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
+++ b/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
@@ -114,7 +114,7 @@ schema can be found at
     version="2.0"&gt;
     &lt;xsd:annotation&gt;
         &lt;xsd:documentation&gt;
-            @(#)persistence_2_0.xsd 1.0 May 8 2009
+            @(#)persistence_2_0.xsd 1.0 July 17 2009
         &lt;/xsd:documentation&gt;
     &lt;/xsd:annotation&gt;
     &lt;xsd:annotation&gt;
@@ -211,8 +211,7 @@ schema can be found at
                                 maxOccurs="unbounded"&gt;
                                 &lt;xsd:annotation&gt;
                                     &lt;xsd:documentation&gt;
-                                        Jar file that should be scanned for entities.
-                                        Not applicable to Java SE persistence units.
+                                        Jar file that is to be scanned for managed classes.
                                     &lt;/xsd:documentation&gt;
                                 &lt;/xsd:annotation&gt;
                             &lt;/xsd:element&gt;
@@ -221,14 +220,15 @@ schema can be found at
                                 minOccurs="0" maxOccurs="unbounded"&gt;
                                 &lt;xsd:annotation&gt;
                                     &lt;xsd:documentation&gt;
-                                        Class to scan for annotations. It should be annotated
+                                        Managed class to be included in the persistence unit and
+                                        to scan for annotations. It should be annotated
                                         with either @Entity, @Embeddable or @MappedSuperclass.
                                     &lt;/xsd:documentation&gt;
                                 &lt;/xsd:annotation&gt;
                             &lt;/xsd:element&gt;
                             &lt;!-- **************************************************** --&gt;
                             &lt;xsd:element name="exclude-unlisted-classes"
-                                type="xsd:boolean" default="false"
+                                type="xsd:boolean" default="true"
                                 minOccurs="0"&gt;
                                 &lt;xsd:annotation&gt;
                                     &lt;xsd:documentation&gt;
@@ -263,8 +263,7 @@ schema can be found at
                                 minOccurs="0"&gt;
                                 &lt;xsd:annotation&gt;
                                     &lt;xsd:documentation&gt;
-                                        Specifies the validation mode to be used for the
-                                        persistence unit.
+                                        The validation mode to be used for the persistence unit.
                                     &lt;/xsd:documentation&gt;
                                 &lt;/xsd:annotation&gt;
                             &lt;/xsd:element&gt;
@@ -273,7 +272,8 @@ schema can be found at
                                 minOccurs="0"&gt;
                                 &lt;xsd:annotation&gt;
                                     &lt;xsd:documentation&gt;
-                                        A list of vendor-specific properties.
+                                        A list of standard and vendor-specific properties
+                                        and hints.
                                     &lt;/xsd:documentation&gt;
                                 &lt;/xsd:annotation&gt;
                                 &lt;xsd:complexType&gt;
@@ -328,7 +328,7 @@ schema can be found at
     &lt;xsd:simpleType name="persistence-unit-transaction-type"&gt;
         &lt;xsd:annotation&gt;
             &lt;xsd:documentation&gt;
-                public enum TransactionType { JTA, RESOURCE_LOCAL };
+                public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
             &lt;/xsd:documentation&gt;
         &lt;/xsd:annotation&gt;
         &lt;xsd:restriction base="xsd:token"&gt;
@@ -340,7 +340,7 @@ schema can be found at
     &lt;xsd:simpleType name="persistence-unit-caching-type"&gt;
         &lt;xsd:annotation&gt;
             &lt;xsd:documentation&gt;
-                public enum CachingType { ALL, NONE, ENABLE_SELECTIVE,
+                public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE,
                 DISABLE_SELECTIVE, UNSPECIFIED};
             &lt;/xsd:documentation&gt;
         &lt;/xsd:annotation&gt;