diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
index a8e92445b2..74851a3547 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
@@ -19,7 +19,7 @@ import net.sourceforge.pmd.util.CollectionUtil;
  *
  * ClassOrInterfaceDeclaration ::=
  *          ( "class" | "interface" )
- *          <IDENTIFIER>
+ *          <IDENTIFIER>
  *          [ TypeParameters ]
  *          [ ExtendsList ]
  *          [ ImplementsList ]
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckRule.java
index 317b596296..42af70e828 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckRule.java
@@ -25,7 +25,7 @@ import net.sourceforge.pmd.lang.java.symboltable.JavaNameOccurrence;
  *
  * <pre>
  * private boolean checkTrimEmpty(String str) {
- *     for(int i = 0; i < str.length(); i++) {
+ *     for(int i = 0; i &lt; str.length(); i++) {
  *         if(!Character.isWhitespace(str.charAt(i))) {
  *             return false;
  *         }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinition.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinition.java
index 84ad30d89b..6c5bc5b3d6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinition.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinition.java
@@ -167,8 +167,8 @@ public abstract class JavaTypeDefinition implements TypeDefinition {
      * @param numDimensions Number of dimensions added to this type in
      *                      the resulting array type
      *
-     * @throws IllegalArgumentException if numDimensions < 0
      * @return A new type definition, or this if numDimensions == 0
+     * @throws IllegalArgumentException if numDimensions &lt; 0
      */
     // @formatter:on
     public abstract JavaTypeDefinition withDimensions(int numDimensions);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java
index 5ee07c7237..21c5247488 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java
@@ -39,7 +39,7 @@ public final class TypeInferenceResolver {
         List<Bound> newBounds = new ArrayList<>();
         while (!constraints.isEmpty()) {
             List<BoundOrConstraint> reduceResult = constraints.remove(constraints.size() - 1).reduce();
-            
+
             // If null, the types are incompatible
             if (reduceResult == null) {
                 return null;
@@ -384,7 +384,7 @@ public final class TypeInferenceResolver {
 
 
     /**
-     * @return A map of variable -> proper type produced by searching for α = T or T = α bounds
+     * @return A map of variable -&gt; proper type produced by searching for α = T or T = α bounds
      */
     public static Map<Variable, JavaTypeDefinition> getInstantiations(List<Bound> bounds) {
         Map<Variable, JavaTypeDefinition> result = new HashMap<>();
diff --git a/pom.xml b/pom.xml
index 489c55796e..27c223d542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,7 +265,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
         <checkstyle.version>3.0.0</checkstyle.version>
         <pmd.plugin.version>3.10.0</pmd.plugin.version>
         <ant.version>1.10.1</ant.version>
-        <javadoc.plugin.version>3.0.0-M1</javadoc.plugin.version>
+        <javadoc.plugin.version>3.0.1</javadoc.plugin.version>
         <antlr.version>4.7</antlr.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -395,6 +395,9 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                     <configuration>
                         <quiet>true</quiet>
                         <doclint>none</doclint>
+                        <additionalJOptions>
+                            <additionalJOption>-html5</additionalJOption>
+                        </additionalJOptions>
                         <additionalDependencies>
                             <!-- TODO: this is only needed to make javadoc happy -->
                             <additionalDependency>