diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/Cache71Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/Cache71Dialect.java
index 641c62c70f..a41c156e5b 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/Cache71Dialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/Cache71Dialect.java
@@ -46,7 +46,6 @@ package org.hibernate.community.dialect;
  * CacheDB.jar depending on your version of Caché.
  * <ol>
  * <li>Copy C:\CacheSys\dev\java\lib\JDK15\CacheDB.jar to C:\Hibernate\lib\CacheDB.jar.</li>
- * <p>
  * <li>Insert the following files into your Java classpath:
  * <p>
  * <ul>
@@ -54,7 +53,6 @@ package org.hibernate.community.dialect;
  * <li>The directory (or directories) where hibernate.properties and/or hibernate.cfg.xml are kept.</li>
  * </ul>
  * </li>
- * <p>
  * <li>In the file, hibernate.properties (or hibernate.cfg.xml),
  * specify the Cach&eacute; dialect and the Cach&eacute; version URL settings.</li>
  * </ol>
@@ -62,7 +60,7 @@ package org.hibernate.community.dialect;
  * For example, in Hibernate 3.2, typical entries in hibernate.properties would have the following
  * "name=value" pairs:
  * <p>
- * <table cols=3 border="" cellpadding=5 cellspacing=0>
+ * <table border="">
  * <tr>
  * <th>Property Name</th>
  * <th>Property Value</th>
@@ -106,7 +104,6 @@ package org.hibernate.community.dialect;
  * <ol>
  * <li>org.hibernate.community.dialect.Cache71Dialect (requires Cach&eacute;
  * 2007.1 or above)</li>
- * <p>
  * </ol>
  * <br>
  * <h2>SUPPORT FOR IDENTITY COLUMNS</h2>
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java
index 673374ed38..3128719c15 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java
@@ -413,7 +413,7 @@ public class IngresDialect extends Dialect {
 	// lock acquisition support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	/**
-	 * <TT>FOR UPDATE</TT> only supported for cursors
+	 * {@code FOR UPDATE} only supported for cursors
 	 *
 	 * @return the empty string
 	 */
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java
index 0a9c0bdd19..2d412971e3 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java
@@ -321,7 +321,7 @@ public class RDMSOS2200Dialect extends Dialect {
 	}
 
 	/**
-	 * <TT>FOR UPDATE</TT> only supported for cursors
+	 * {@code FOR UPDATE} only supported for cursors
 	 *
 	 * @return the empty string
 	 */
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java
index 2fa51f5dda..03d6625a85 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java
@@ -19,7 +19,6 @@ import java.lang.annotation.Target;
  * bi-directional relation.
  * </p>
  * <p>
- * <p>
  * This annotation is <b>experimental</b> and may change in future releases.
  * </p>
  *
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java
index b69649f5bc..930502796a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java
@@ -161,7 +161,7 @@ public interface AuditReader {
 	/**
 	 * Gets the revision number, that corresponds to the given date. More precisely, returns
 	 * the number of the highest revision, which was created on or before the given date. So:
-	 * <code>getRevisionDate(getRevisionNumberForDate(date)) <= date</code> and
+	 * <code>getRevisionDate(getRevisionNumberForDate(date)) &lt;= date</code> and
 	 * <code>getRevisionDate(getRevisionNumberForDate(date)+1) > date</code>.
 	 *
 	 * @param date Date for which to get the revision.
@@ -178,7 +178,7 @@ public interface AuditReader {
 	/**
 	 * Gets the revision number, that corresponds to the given date. More precisely, returns
 	 * the number of the highest revision, which was created on or before the given date. So:
-	 * <code>getRevisionDate(getRevisionNumberForDate(date)) <= date</code> and
+	 * <code>getRevisionDate(getRevisionNumberForDate(date)) &lt;= date</code> and
 	 * <code>getRevisionDate(getRevisionNumberForDate(date)+1) > date</code>.
 	 *
 	 * @param date Date for which to get the revision.
@@ -293,8 +293,10 @@ public interface AuditReader {
 	 *
 	 * @return the entityName for the given entity.
 	 * @throws HibernateException if one of the following conditions are satisfied:
+	 * <ul>
 	 * <li>The supplied entity has yet to be returned by this AuditReader instance, e.g. it isn't in the reader's cache.</li>
 	 * <li>The supplied entity, primary key, and revision triplet is not a valid combination.</li>
+	 * </ul>
 	 */
 	String getEntityName(Object primaryKey, Number revision, Object entity)
 			throws HibernateException;
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
index e36ec0cb74..a741687692 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
@@ -149,7 +149,7 @@ public class AuditQueryCreator {
 	 * <li>the entity instance</li>
 	 * <li>revision entity, corresponding to the revision at which the entity was modified. If no custom
 	 * revision entity is used, this will be an instance of {@link org.hibernate.envers.DefaultRevisionEntity}</li>
-	 * <li>type of the revision (an enum instance of class {@link org.hibernate.envers.RevisionType})</li>.
+	 * <li>type of the revision (an enum instance of class {@link org.hibernate.envers.RevisionType})</li>
 	 * </ol>
 	 * Additional conditions that the results must satisfy may be specified.
 	 *
@@ -185,7 +185,7 @@ public class AuditQueryCreator {
 	 * <li>the entity instance</li>
 	 * <li>revision entity, corresponding to the revision at which the entity was modified. If no custom
 	 * revision entity is used, this will be an instance of {@link org.hibernate.envers.DefaultRevisionEntity}</li>
-	 * <li>type of the revision (an enum instance of class {@link org.hibernate.envers.RevisionType})</li>.
+	 * <li>type of the revision (an enum instance of class {@link org.hibernate.envers.RevisionType})</li>
 	 * </ol>
 	 * Additional conditions that the results must satisfy may be specified.
 	 *
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java
index 7ce86c7dc2..defe56673d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java
@@ -15,15 +15,12 @@ package org.hibernate.envers.strategy;
  * <li>At the same time the <strong>end-revision</strong> field of the <strong>previous</strong> audit row is set to this revision</li>
  * <li>Queries are retrieved using 'between start and end revision', instead of a subquery.</li>
  * </ul>
- * </p>
- * <p>
  * <p>
  * This has a few important consequences that need to be judged against against each other:
  * <ul>
  * <li>Persisting audit information is a bit slower, because an extra row is updated</li>
  * <li>Retrieving audit information is a lot faster</li>
  * </ul>
- * </p>
  *
  * @deprecated use {@link org.hibernate.envers.strategy.internal.ValidityAuditStrategy} instead.
  *