diff --git a/src/javax/persistence/AssociationOverride.java b/src/javax/persistence/AssociationOverride.java
index d773c02..47d8b5a 100644
--- a/src/javax/persistence/AssociationOverride.java
+++ b/src/javax/persistence/AssociationOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. 
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved. 
  * 
  * This program and the accompanying materials are made available under the 
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
@@ -63,7 +63,6 @@
  * be specified to override the mapping of the join table and/or its
  * join columns.
  *
- * <p>
  * <pre>
  *    Example 1: Overriding the mapping of a relationship defined by a mapped superclass
  *
diff --git a/src/javax/persistence/ColumnResult.java b/src/javax/persistence/ColumnResult.java
index ff42571..160f3f8 100644
--- a/src/javax/persistence/ColumnResult.java
+++ b/src/javax/persistence/ColumnResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -38,7 +38,7 @@
  *           "o.item AS order_item, " + 
  *           "i.name AS item_name, " +
  *         "FROM Order o, Item i " +
- *         "WHERE (order_quantity > 25) AND (order_item = i.id)",
+ *         "WHERE (order_quantity &gt; 25) AND (order_item = i.id)",
  *       "OrderResults");
  *
  *   &#064;SqlResultSetMapping(name="OrderResults",
diff --git a/src/javax/persistence/EntityResult.java b/src/javax/persistence/EntityResult.java
index 1e74264..e645910 100644
--- a/src/javax/persistence/EntityResult.java
+++ b/src/javax/persistence/EntityResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -35,7 +35,7 @@
  *   Query q = em.createNativeQuery(
  *       "SELECT o.id, o.quantity, o.item, i.id, i.name, i.description "+
  *           "FROM Order o, Item i " +
- *           "WHERE (o.quantity > 25) AND (o.item = i.id)",
+ *           "WHERE (o.quantity &gt; 25) AND (o.item = i.id)",
  *       "OrderItemResults");
  *   &#064;SqlResultSetMapping(name="OrderItemResults",
  *       entities={
diff --git a/src/javax/persistence/Enumerated.java b/src/javax/persistence/Enumerated.java
index ad8c4ca..d78b2db 100644
--- a/src/javax/persistence/Enumerated.java
+++ b/src/javax/persistence/Enumerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -29,7 +29,7 @@
  * conjunction with the <code>ElementCollection</code> annotation when the
  * element collection value is of basic type.  If the enumerated type
  * is not specified or the <code>Enumerated</code> annotation is not
- * used, the <code>EnumType</code> value is assumed to be <code>ORDINAL<code>.
+ * used, the <code>EnumType</code> value is assumed to be <code>ORDINAL</code>.
  *
  * <pre>
  *   Example:
diff --git a/src/javax/persistence/FieldResult.java b/src/javax/persistence/FieldResult.java
index 7aae6bc..c28c885 100644
--- a/src/javax/persistence/FieldResult.java
+++ b/src/javax/persistence/FieldResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -31,7 +31,7 @@
  *           "o.quantity AS order_quantity, " +
  *           "o.item AS order_item, " +
  *         "FROM Order o, Item i " +
- *         "WHERE (order_quantity > 25) AND (order_item = i.id)",
+ *         "WHERE (order_quantity &gt; 25) AND (order_item = i.id)",
  *       "OrderResults");
  *
  *   &#064;SqlResultSetMapping(name="OrderResults",
diff --git a/src/javax/persistence/Inheritance.java b/src/javax/persistence/Inheritance.java
index fe44c5e..e6a0dc5 100644
--- a/src/javax/persistence/Inheritance.java
+++ b/src/javax/persistence/Inheritance.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -26,7 +26,7 @@
  * hierarchy. It is specified on the entity class that is the root of
  * the entity class hierarchy.  If the <code>Inheritance</code> annotation is not
  * specified or if no inheritance type is specified for an entity
- * class hierarchy, the <code>SINGLE_TABLE<code> mapping strategy is used.
+ * class hierarchy, the <code>SINGLE_TABLE</code> mapping strategy is used.
  *
  * <pre>
  *
diff --git a/src/javax/persistence/LockModeType.java b/src/javax/persistence/LockModeType.java
index 622efec..cacff72 100644
--- a/src/javax/persistence/LockModeType.java
+++ b/src/javax/persistence/LockModeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -50,8 +50,8 @@
  * Transaction T2 eventually commits successfully; it does not 
  * matter whether T1 commits or rolls back and whether it does 
  * so before or after T2 commits.
- *   <li>
- *   </li> P2 (Non-repeatable read): Transaction T1 reads a row. 
+ *   </li>
+ *   <li> P2 (Non-repeatable read): Transaction T1 reads a row. 
  * Another transaction T2 then modifies or deletes that row, 
  * before T1 has committed. Both transactions eventually commit 
  * successfully.
diff --git a/src/javax/persistence/SharedCacheMode.java b/src/javax/persistence/SharedCacheMode.java
index b7ca900..31e81e4 100644
--- a/src/javax/persistence/SharedCacheMode.java
+++ b/src/javax/persistence/SharedCacheMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -43,8 +43,8 @@
 
     /**
      * Caching is enabled for all entities except those for which
-     * <code>Cacheable(false) is specified.  Entities for which
-     * <code>Cacheable(false) is specified are not cached.
+     * <code>Cacheable(false)</code> is specified.  Entities for which
+     * <code>Cacheable(false)</code> is specified are not cached.
      */
     DISABLE_SELECTIVE, 
 
diff --git a/src/javax/persistence/SqlResultSetMapping.java b/src/javax/persistence/SqlResultSetMapping.java
index 0db0dd5..94d86f7 100644
--- a/src/javax/persistence/SqlResultSetMapping.java
+++ b/src/javax/persistence/SqlResultSetMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -33,7 +33,7 @@
  *            "o.item AS order_item, " +
  *            "i.name AS item_name, " +
  *        "FROM Order o, Item i " +
- *        "WHERE (order_quantity > 25) AND (order_item = i.id)",
+ *        "WHERE (order_quantity &gt; 25) AND (order_item = i.id)",
  *    "OrderResults");
  *    
  *    &#064;SqlResultSetMapping(name="OrderResults", 
diff --git a/src/javax/persistence/spi/PersistenceProvider.java b/src/javax/persistence/spi/PersistenceProvider.java
index fe761b4..38386c7 100644
--- a/src/javax/persistence/spi/PersistenceProvider.java
+++ b/src/javax/persistence/spi/PersistenceProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -16,6 +16,7 @@
 package javax.persistence.spi;
 
 import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceException;
 import java.util.Map;
 
 /**
diff --git a/src/javax/persistence/spi/PersistenceProviderResolverHolder.java b/src/javax/persistence/spi/PersistenceProviderResolverHolder.java
index 0c9da9e..f81f111 100644
--- a/src/javax/persistence/spi/PersistenceProviderResolverHolder.java
+++ b/src/javax/persistence/spi/PersistenceProviderResolverHolder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -38,7 +38,7 @@
 /**
  * Holds the global {@link javax.persistence.spi.PersistenceProviderResolver}
  * instance. If no <code>PersistenceProviderResolver</code> is set by the
- * environment, the default </code>PersistenceProviderResolver is used.
+ * environment, the default <code>PersistenceProviderResolver</code> is used.
  * 
  * Implementations must be thread-safe.
  * 
diff --git a/src/javax/persistence/spi/PersistenceUnitInfo.java b/src/javax/persistence/spi/PersistenceUnitInfo.java
index c8e107f..e994802 100644
--- a/src/javax/persistence/spi/PersistenceUnitInfo.java
+++ b/src/javax/persistence/spi/PersistenceUnitInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2014 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -32,7 +32,7 @@
 	
     /**
      * Returns the name of the persistence unit. Corresponds to the
-     * <code>name</code> attribute in the <code>persistence.xml<code> file.
+     * <code>name</code> attribute in the <code>persistence.xml</code> file.
      * @return  the name of the persistence unit 
      */
     public String getPersistenceUnitName();