diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/common/LambdaASTVisitor.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/common/LambdaASTVisitor.java
index 5dc9f5b17d6..40b61b29179 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/common/LambdaASTVisitor.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/common/LambdaASTVisitor.java
@@ -22,7 +22,7 @@
  *
  * @author chammer
  *
- * @param <E> - type that extends HelpVisitorProvider that provides HelperVisitor<V, T>
+ * @param <E> - type that extends HelpVisitorProvider that provides {@code HelperVisitor<V, T>}
  * @param <V> - type that HelperVisitor uses as map key type
  * @param <T> - type that HelperVisitor uses as map value type
  */
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/JavaElementLabelsCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/JavaElementLabelsCore.java
index 245e2e2d0a9..236f7d59ce6 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/JavaElementLabelsCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/JavaElementLabelsCore.java
@@ -341,7 +341,7 @@ public final class JavaElementLabelsCore {
 	public final static long ALL_POST_QUALIFIED= F_POST_QUALIFIED | M_POST_QUALIFIED | I_POST_QUALIFIED | T_POST_QUALIFIED | TP_POST_QUALIFIED | D_POST_QUALIFIED | CF_POST_QUALIFIED | CU_POST_QUALIFIED | P_POST_QUALIFIED | ROOT_POST_QUALIFIED;
 
 	/**
-	 *  Default options (M_PARAMETER_TYPES,  M_APP_TYPE_PARAMETERS & T_TYPE_PARAMETERS enabled)
+	 *  Default options (M_PARAMETER_TYPES,  M_APP_TYPE_PARAMETERS, T_TYPE_PARAMETERS enabled)
 	 */
 	public final static long ALL_DEFAULT= M_PARAMETER_TYPES | M_APP_TYPE_PARAMETERS | T_TYPE_PARAMETERS;
 
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/MembersOrderPreferenceCacheCommon.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/MembersOrderPreferenceCacheCommon.java
index 1d9952bbe24..33e463c76b4 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/MembersOrderPreferenceCacheCommon.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/core/manipulation/MembersOrderPreferenceCacheCommon.java
@@ -45,7 +45,6 @@ public class MembersOrderPreferenceCacheCommon {
 	 * <li><b>SM</b>: Static Methods</li>
 	 * <li><b>SF</b>: Static Fields</li>
 	 * </ul>
-	 * </p>
 	 */
 	public static final String APPEARANCE_MEMBER_SORT_ORDER= "outlinesortoption"; //$NON-NLS-1$
 
@@ -62,7 +61,6 @@ public class MembersOrderPreferenceCacheCommon {
 	 * <li><b>R</b>: Protected</li>
 	 * <li><b>D</b>: Default</li>
 	 * </ul>
-	 * </p>
 	 */
 	public static final String APPEARANCE_VISIBILITY_SORT_ORDER= "org.eclipse.jdt.ui.visibility.order"; //$NON-NLS-1$
 
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/IJavaStatusConstants.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/IJavaStatusConstants.java
index d28acb97083..6e89fb4eb49 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/IJavaStatusConstants.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/IJavaStatusConstants.java
@@ -39,7 +39,7 @@ public interface IJavaStatusConstants {
 	int VALIDATE_EDIT_CHANGED_CONTENT= 10003;
 
 	/**
-	 * Status constant indicating that a <tt>ChangeAbortException</tt> has been
+	 * Status constant indicating that a <code>ChangeAbortException</code> has been
 	 * caught.
  	 */
 	int CHANGE_ABORTED= 10004;
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/util/StringMatcher.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/util/StringMatcher.java
index 287b2691041..bea6a28abb5 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/util/StringMatcher.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/util/StringMatcher.java
@@ -82,7 +82,7 @@ public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards
 		}
 	}
 	/**
-	 * Find the first occurrence of the pattern between <code>start</code)(inclusive)
+	 * Find the first occurrence of the pattern between <code>start</code>(inclusive)
 	 * and <code>end</code>(exclusive).
 	 * @param text the String object to search in
 	 * @param start the starting index of the search range, inclusive
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java
index 0d9e9e08328..33e3077c048 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java	
@@ -292,7 +292,6 @@ public static boolean canRemoveParentheses(Expression expression, ASTNode parent
 	 * <li>The <code>infixExpression</code> must not have additional operands.</li>
 	 * <li>The <code>rightOperand</code> node must have bindings.</li>
 	 * </ul>
-	 * </p>
 	 *
 	 * @param rightOperand the right operand in <code>infixExpression</code>
 	 * @param infixExpression the parent infix expression
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/OperatorPrecedence.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/OperatorPrecedence.java
index d245dd84f5e..51a186c84a4 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/OperatorPrecedence.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/OperatorPrecedence.java	
@@ -51,7 +51,7 @@ public class OperatorPrecedence {
 	 * with higher precedence are executed before expressions
 	 * with lower precedence.
 	 * i.e. in:
-	 * <br><code> int a= ++3--;</code></br>
+	 * <br><code> int a= ++3--;</code><br>
 	 *
 	 * the  precedence order is
 	 * <ul>
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/BasicElementLabels.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/BasicElementLabels.java
index aea795c4476..828df044402 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/BasicElementLabels.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/BasicElementLabels.java	
@@ -116,7 +116,7 @@ public static String getFileName(ITypeRoot typeRoot) {
 	}
 
 	/**
-	 * Returns a label for Java element name. Example is 'new Test<? extends List>() { ...}'.
+	 * Returns a label for Java element name. Example is {@code new Test<? extends List>() { ...}}.
 	 * This method should only be used for simple element names. Use
 	 * org.eclipse.jdt.ui.JavaElementLabels to create a label from a Java element or
 	 * org.eclipse.jdt.internal.ui.viewsupport.BindingLabelProvider for labels of bindings.
@@ -129,7 +129,7 @@ public static String getJavaElementName(String name) {
 	}
 
 	/**
-	 * Returns a label for Java code snippet used in a label. Example is 'Test test= new Test<? extends List>() { ...}'.
+	 * Returns a label for Java code snippet used in a label. Example is {@code 'Test test= new Test<? extends List>() { ...}}.
 	 *
 	 * @param string the Java code snippet
 	 * @return the label for the Java code snippet
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/Strings.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/Strings.java
index 62f131d78fb..f6c669312a0 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/Strings.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/util/Strings.java	
@@ -139,8 +139,8 @@ public static String removeNewLine(String message) {
 	 * don't contain any line delimiter characters.
 	 *
 	 * @param input the string
-	 * @return the string converted into an array of strings. Returns <code>
-	 * 	null</code> if the input string can't be converted in an array of lines.
+	 * @return the string converted into an array of strings. Returns {@code
+	 * 	null} if the input string can't be converted in an array of lines.
 	 */
 	public static String[] convertIntoLines(String input) {
 		try {
@@ -160,13 +160,13 @@ public static String[] convertIntoLines(String input) {
 	}
 
 	/**
-	 * Returns <code>true</code> if the given string only consists of
-	 * white spaces according to Java. If the string is empty, <code>true
-	 * </code> is returned.
+	 * Returns {@code true} if the given string only consists of
+	 * white spaces according to Java. If the string is empty, {@code true
+	 * } is returned.
 	 *
 	 * @param s the string to test
-	 * @return <code>true</code> if the string only consists of white
-	 * 	spaces; otherwise <code>false</code> is returned
+	 * @return {@code true} if the string only consists of white
+	 * 	spaces; otherwise {@code false} is returned
 	 *
 	 * @see java.lang.Character#isWhitespace(char)
 	 */
@@ -229,7 +229,7 @@ else if (end == 0)
 	 *
 	 * @param line the text line
 	 * @param project the java project from which to get the formatter
-	 *        preferences, or <code>null</code> for global preferences
+	 *        preferences, or {@code null} for global preferences
 	 * @return the number of indent units
 	 * @since 3.1
 	 */
@@ -266,12 +266,12 @@ public static int computeIndentUnits(String line, int tabWidth, int indentWidth)
 
 	/**
 	 * Computes the visual length of the indentation of a
-	 * <code>CharSequence</code>, counting a tab character as the size until
+	 * {@code CharSequence}, counting a tab character as the size until
 	 * the next tab stop and every other whitespace character as one.
 	 *
 	 * @param line the string to measure the indent of
 	 * @param tabSize the visual size of a tab in space equivalents
-	 * @return the visual length of the indentation of <code>line</code>
+	 * @return the visual length of the indentation of {@code line}
 	 * @since 3.1
 	 */
 	public static int measureIndentLength(CharSequence line, int tabSize) {
@@ -280,13 +280,13 @@ public static int measureIndentLength(CharSequence line, int tabSize) {
 
 	/**
 	 * Removes the given number of indents from the line. Asserts that the given line
-	 * has the requested number of indents. If <code>indentsToRemove <= 0</code>
+	 * has the requested number of indents. If {@code indentsToRemove <= 0}
 	 * the line is returned.
 	 * @param line the line
 	 * @param indentsToRemove the indents to remove
 	 *
 	 * @param project the java project from which to get the formatter
-	 *        preferences, or <code>null</code> for global preferences
+	 *        preferences, or {@code null} for global preferences
 	 * @return the trimmed line
 	 *
 	 * @since 3.1
@@ -297,7 +297,7 @@ public static String trimIndent(String line, int indentsToRemove, IJavaProject p
 
 	/**
 	 * Removes the given number of indents from the line. Asserts that the given line
-	 * has the requested number of indents. If <code>indentsToRemove <= 0</code>
+	 * has the requested number of indents. If {@code indentsToRemove <= 0}
 	 * the line is returned.
 	 *
 	 * @param line the line
@@ -311,7 +311,7 @@ public static String trimIndent(String line, int indentsToRemove, ICompilationUn
 
 	/**
 	 * Removes the given number of indents from the line. Asserts that the given line
-	 * has the requested number of indents. If <code>indentsToRemove <= 0</code>
+	 * has the requested number of indents. If {@code indentsToRemove <= 0}
 	 * the line is returned.
 	 * @param line the line
 	 * @param indentsToRemove the indents to remove
@@ -331,7 +331,7 @@ public static String trimIndent(String line, int indentsToRemove, int tabWidth,
 	 * @param lines the lines
 
 	 * @param project the java project from which to get the formatter
-	 *        preferences, or <code>null</code> for global preferences
+	 *        preferences, or {@code null} for global preferences
 	 * @since 3.1
 	 */
 	public static void trimIndentation(String[] lines, IJavaProject project) {
@@ -353,13 +353,13 @@ public static void trimIndentation(String[] lines, int tabWidth, int indentWidth
 
 	/**
 	 * Removes the common number of indents from all lines. If a line
-	 * only consists out of white space it is ignored. If <code>
-	 * considerFirstLine</code> is false the first line will be ignored.
+	 * only consists out of white space it is ignored. If {@code
+	 * considerFirstLine} is false the first line will be ignored.
 	 * @param lines the lines
 	 *
 	 * @param project the java project from which to get the formatter
-	 *        preferences, or <code>null</code> for global preferences
-	 * @param considerFirstLine  If <code>considerFirstLine</code> is false the first line will be ignored.
+	 *        preferences, or {@code null} for global preferences
+	 * @param considerFirstLine  If {@code considerFirstLine} is false the first line will be ignored.
 	 * @since 3.1
 	 */
 	public static void trimIndentation(String[] lines, IJavaProject project, boolean considerFirstLine) {
@@ -368,12 +368,12 @@ public static void trimIndentation(String[] lines, IJavaProject project, boolean
 
 	/**
 	 * Removes the common number of indents from all lines. If a line
-	 * only consists out of white space it is ignored. If <code>
-	 * considerFirstLine</code> is false the first line will be ignored.
+	 * only consists out of white space it is ignored. If {@code
+	 * considerFirstLine} is false the first line will be ignored.
 	 *
 	 * @param lines the lines
 	 * @param cu the compilation unit from which to get the formatter preferences
-	 * @param considerFirstLine  If <code>considerFirstLine</code> is false the first line will be ignored.
+	 * @param considerFirstLine  If {@code considerFirstLine} is false the first line will be ignored.
 	 */
 	public static void trimIndentation(String[] lines, ICompilationUnit cu, boolean considerFirstLine) {
 		trimIndentation(lines, CodeFormatterUtil.getTabWidth(cu), CodeFormatterUtil.getIndentWidth(cu), considerFirstLine);
@@ -381,12 +381,12 @@ public static void trimIndentation(String[] lines, ICompilationUnit cu, boolean
 
 	/**
 	 * Removes the common number of indents from all lines. If a line
-	 * only consists out of white space it is ignored. If <code>
-	 * considerFirstLine</code> is false the first line will be ignored.
+	 * only consists out of white space it is ignored. If {@code
+	 * considerFirstLine} is false the first line will be ignored.
 	 * @param lines the lines
 	 * @param tabWidth the size of one tab in space equivalents
 	 * @param indentWidth the size of the indent in space equivalents
-	 * @param considerFirstLine If <code> considerFirstLine</code> is false the first line will be ignored.
+	 * @param considerFirstLine If {@code  considerFirstLine} is false the first line will be ignored.
 	 * @since 3.1
 	 */
 	public static void trimIndentation(String[] lines, int tabWidth, int indentWidth, boolean considerFirstLine) {
@@ -423,13 +423,13 @@ public static void trimIndentation(String[] lines, int tabWidth, int indentWidth
 	}
 
 	/**
-	 * Returns that part of the indentation of <code>line</code> that makes up
+	 * Returns that part of the indentation of {@code line} that makes up
 	 * a multiple of indentation units.
 	 *
 	 * @param line the line to scan
 	 * @param project the java project from which to get the formatter
-	 *        preferences, or <code>null</code> for global preferences
-	 * @return the indent part of <code>line</code>, but no odd spaces
+	 *        preferences, or {@code null} for global preferences
+	 * @return the indent part of {@code line}, but no odd spaces
 	 * @since 3.1
 	 */
 	public static String getIndentString(String line, IJavaProject project) {
@@ -437,25 +437,25 @@ public static String getIndentString(String line, IJavaProject project) {
 	}
 
 	/**
-	 * Returns that part of the indentation of <code>line</code> that makes up
+	 * Returns that part of the indentation of {@code line} that makes up
 	 * a multiple of indentation units.
 	 *
 	 * @param line the line to scan
 	 * @param cu the compilation unit from which to get the formatter preferences
-	 * @return the indent part of <code>line</code>, but no odd spaces
+	 * @return the indent part of {@code line}, but no odd spaces
 	 */
 	public static String getIndentString(String line, ICompilationUnit cu) {
 		return IndentManipulation.extractIndentString(line, CodeFormatterUtil.getTabWidth(cu), CodeFormatterUtil.getIndentWidth(cu));
 	}
 
 	/**
-	 * Returns that part of the indentation of <code>line</code> that makes up
+	 * Returns that part of the indentation of {@code line} that makes up
 	 * a multiple of indentation units.
 	 *
 	 * @param line the line to scan
 	 * @param tabWidth the size of one tab in space equivalents
 	 * @param indentWidth the size of the indent in space equivalents
-	 * @return the indent part of <code>line</code>, but no odd spaces
+	 * @return the indent part of {@code line}, but no odd spaces
 	 * @since 3.1
 	 */
 	public static String getIndentString(String line, int tabWidth, int indentWidth) {
@@ -485,7 +485,7 @@ private static int findLastNonEmptyLineIndex(String[] sourceLines) {
 	 * @param codeIndentLevel level of indentation
 	 *
 	 * @param project the java project from which to get the formatter
-	 *        preferences, or <code>null</code> for global preferences
+	 *        preferences, or {@code null} for global preferences
 	 * @param newIndent new indent
 	 * @param lineDelim line delimiter
 	 * @return the changed code
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java
index a059dc7ffa5..a2521a0fd5f 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java	
@@ -127,7 +127,6 @@
  * implementation is consistent with the wrapper types java.lang.Float and
  * java.lang.Double.</li>
  * </ul>
- * </p>
  *
  * @since 3.2
  */
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/AbstractToStringGenerator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/AbstractToStringGenerator.java
index 3793475d2a3..63a73751bbe 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/AbstractToStringGenerator.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/AbstractToStringGenerator.java	
@@ -76,11 +76,9 @@
  * which lists all selected fields and methods. What exactly is listed and how members are separated
  * is determined by a format template.
  * <p>
- *
- * <p>
  * To print out items of arrays and/or limit number items printed for arrays, collections and so on,
  * various methods are used according to actual jdk compatibility:
- * <table border="10">
+ * <table border="1">
  * <tr>
  * <td></td>
  * <th><code>java.util.List</code></th>
@@ -110,7 +108,7 @@
  * <td>-</td>
  * <td>-</td>
  * <td>-</td>
- * <td><code>Arrays.toString()<code></td>
+ * <td><code>Arrays.toString()</code></td>
  * <td><code>Arrays.asList(member)</code></td>
  * </tr>
  * <tr>
@@ -132,7 +130,6 @@
  * </table>
  * Additionally, if helper method is generated it is also used for other members members (even if
  * other solution could be used), as it makes the code cleaner.
- * </p>
  *
  * @since 3.5
  */
@@ -247,7 +244,7 @@ protected void createMethodComment() throws CoreException {
 	 *
 	 * @param array if true, generated method will convert array to string, otherwise -
 	 *            <code>Collection</code>
-	 * @return <code>arrayToString(Object[] array)</code> or </code>collectionToString(Collection
+	 * @return <code>arrayToString(Object[] array)</code> or <code>collectionToString(Collection
 	 *         collection)</code> method
 	 */
 	protected MethodDeclaration createHelperToStringMethod(boolean array) {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/CustomBuilderGenerator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/CustomBuilderGenerator.java
index ae98a711c8f..b2d67080a27 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/CustomBuilderGenerator.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/CustomBuilderGenerator.java	
@@ -64,7 +64,6 @@
  * <li>Provides a result method (usually <code>toString()</code>), that is a method that takes no
  * arguments and returns a String</li>
  * </ul>
- * </p>
  * <p>
  * Generated methods look like this:
  *
@@ -77,8 +76,6 @@
  * }
  * </pre>
  *
- * </p>
- *
  * @since 3.5
  */
 public class CustomBuilderGenerator extends AbstractToStringGenerator {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderChainGenerator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderChainGenerator.java
index 46ffdbd9699..e20bed4aacf 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderChainGenerator.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderChainGenerator.java	
@@ -20,10 +20,10 @@
 import org.eclipse.jdt.core.dom.Block;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.IfStatement;
+import org.eclipse.jdt.core.dom.InfixExpression.Operator;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.Statement;
 import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.InfixExpression.Operator;
 
 /**
  * <p>
@@ -42,8 +42,6 @@
  * }
  * </pre>
  *
- * </p>
- *
  * @since 3.5
  */
 public class StringBuilderChainGenerator extends StringBuilderGenerator {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderGenerator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderGenerator.java
index c1513e49c88..0ac76550b58 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderGenerator.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringBuilderGenerator.java	
@@ -51,8 +51,6 @@
  * }
  * </pre>
  *
- * </p>
- *
  * @since 3.5
  */
 public class StringBuilderGenerator extends AbstractToStringGenerator {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringConcatenationGenerator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringConcatenationGenerator.java
index cd64164ce94..55c74d9bc25 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringConcatenationGenerator.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringConcatenationGenerator.java	
@@ -20,10 +20,10 @@
 import org.eclipse.jdt.core.dom.ConditionalExpression;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.InfixExpression;
+import org.eclipse.jdt.core.dom.InfixExpression.Operator;
 import org.eclipse.jdt.core.dom.ParenthesizedExpression;
 import org.eclipse.jdt.core.dom.ReturnStatement;
 import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.InfixExpression.Operator;
 
 
 /**
@@ -40,8 +40,6 @@
  * }
  * </pre>
  *
- * </p>
- *
  * @since 3.5
  */
 public class StringConcatenationGenerator extends AbstractToStringGenerator {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringFormatGenerator.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringFormatGenerator.java
index 3f9b76f73bb..b6e12f11af4 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringFormatGenerator.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/StringFormatGenerator.java	
@@ -43,8 +43,6 @@
  * }
  * </pre>
  *
- * </p>
- *
  * @since 3.5
  */
 public class StringFormatGenerator extends AbstractToStringGenerator {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/ToStringTemplateParser.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/ToStringTemplateParser.java
index 69be21368f6..645b58f2884 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/ToStringTemplateParser.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/tostringgeneration/ToStringTemplateParser.java	
@@ -35,14 +35,13 @@
  * variable to the variable directly preceding the <code>${otherMembers}</code>, inclusively. The
  * content of this part is used once for every processed member. All template variables are
  * available (except for <code>${otherMembers}</code>).
- * <li><b>Separator</b></li> - all the characters from the template variable directly preceding the
+ * <li><b>Separator</b> - all the characters from the template variable directly preceding the
  * <code>${otherMembers}</code> to the <code>${otherMembers}</code>, exclusively. This part does not
  * contain template variables and is used to separate members in the generated <code>String</code>.
  * <li><b>Ending</b> - all the characters from the occurrence of the <code>${otherMembers}</code>
  * variable (exclusively) to the end of the template (inclusively). This part can also contain only
  * <code>${object.*}</code> variables.</li>
  * </ul>
- * </p>
  * <p>
  * Note: for the template to work properly, it must contain at least one <code>${member.*}</code>
  * variable and exactly one <code>${otherMembers}</code> variable. Additionally, no
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTNodeFactory.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTNodeFactory.java
index ab8d279e728..93fe1fe7ddc 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTNodeFactory.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTNodeFactory.java	
@@ -172,7 +172,7 @@ public static Expression not(final AST ast, final Expression expression) {
 	/**
 	 * Negates the provided expression and applies the provided copy operation on
 	 * the returned expression:
-	 *
+	 * <pre>{@code
 	 * isValid  =>  !isValid
 	 * !isValid =>  isValid
 	 * true                           =>  false
@@ -181,6 +181,7 @@ public static Expression not(final AST ast, final Expression expression) {
 	 * isValid || isEnabled           =>  !isValid && !isEnabled
 	 * !isValid || !isEnabled         =>  isValid && isEnabled
 	 * isValid ? (i > 0) : !isEnabled =>  isValid ? (i <= 0) : isEnabled
+	 * }</pre>
 	 *
 	 * @param ast The AST to create the resulting node with.
 	 * @param rewrite the rewrite
@@ -195,7 +196,7 @@ public static Expression negate(final AST ast, final ASTRewrite rewrite, final E
 	/**
 	 * Negates the provided expression and applies the provided copy operation on
 	 * the returned expression and unwraps parentheses of result (e.g. !(x > 2) => x > 2:
-	 *
+	 * <pre>{@code
 	 * isValid  =>  !isValid
 	 * !isValid =>  isValid
 	 * true                           =>  false
@@ -204,6 +205,7 @@ public static Expression negate(final AST ast, final ASTRewrite rewrite, final E
 	 * isValid || isEnabled           =>  !isValid && !isEnabled
 	 * !isValid || !isEnabled         =>  isValid && isEnabled
 	 * isValid ? (i > 0) : !isEnabled =>  isValid ? (i <= 0) : isEnabled
+	 * }</pre>
 	 *
 	 * @param ast The AST to create the resulting node with.
 	 * @param rewrite the rewrite
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTSemanticMatcher.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTSemanticMatcher.java
index b0c1f641d6d..a81a6baa6d3 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTSemanticMatcher.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ASTSemanticMatcher.java	
@@ -54,6 +54,7 @@
 /**
  * Matches two pieces of code on semantic (not on syntax).
  * ASTSemanticMatcher.java matches more cases than ASTMatcher.java:
+ * <pre>{@code
  * - Inverted commutative operations:
  *   k + 1
  *   1 + k
@@ -91,6 +92,7 @@
  * - Inverted if statements or ternary expressions:
  *   if (isValid) k++; else m--;
  *   if (!isValid) m--; else k++;
+ * }</pre>
  *
  * You can also match opposite boolean expressions:
  * ASTSemanticMatcher.matchOpposite()
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/HierarchicalASTVisitor.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/HierarchicalASTVisitor.java
index ee3e3d68487..c415633a684 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/HierarchicalASTVisitor.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/HierarchicalASTVisitor.java	
@@ -28,7 +28,7 @@
  * </p>
  *
  * <p>
- * <b>Details:<b>
+ * <b>Details:</b>
  * </p>
  *
  * <p>
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IASTFragment.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IASTFragment.java
index bc71248e4a3..727dd2d4604 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IASTFragment.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IASTFragment.java	
@@ -51,7 +51,7 @@ public interface IASTFragment {
 	 * are the same, or that they map (via getAssociatedNode()) to the
 	 * same node.
 	 * @param other the element to test with
-	 * @return return <code> true if the passed element matches the current element.
+	 * @return return <code>true</code> if the passed element matches the current element.
 	 */
 	boolean matches(IASTFragment other);
 
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IExpressionFragment.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IExpressionFragment.java
index 62d7748ab23..39d4700a5f5 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IExpressionFragment.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/fragments/IExpressionFragment.java	
@@ -38,7 +38,7 @@ public interface IExpressionFragment extends IASTFragment {
 	 * Creates a copy of this IExpressionFragment.
 	 *
 	 * @param rewrite an ASTRewrite
-	 * @param removeSurroundingParenthesis if set to <code>true</true>, a surrounding ParenthesizedExpression will not be part of
+	 * @param removeSurroundingParenthesis if set to <code>true</code>, a surrounding ParenthesizedExpression will not be part of
 	 * the copied node.
 	 * @return a copy of this IExpressionFragment, ready for use in the given
 	 *         rewrite
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpConstants.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpConstants.java
index 17777770d5a..9f649467e3a 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpConstants.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpConstants.java	
@@ -645,10 +645,9 @@ public class CleanUpConstants {
 	public static String CONTROL_STATMENTS_CONVERT_FOR_LOOP_ONLY_IF_LOOP_VAR_USED= CONTROL_STATEMENTS_CONVERT_FOR_LOOP_ONLY_IF_LOOP_VAR_USED;
 
 	/**
-	 * Replaces <code>if</code>/<code>else if</code>/<code>else</code> blocks to use <code>switch</code> where possible.
+	 * Replaces {@code if}/{@code else if}/{@code else} blocks to use {@code switch} where possible.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -763,10 +762,9 @@ public class CleanUpConstants {
 	public static final String USE_LAZY_LOGICAL_OPERATOR= "cleanup.lazy_logical_operator"; //$NON-NLS-1$
 
 	/**
-	 * Replace unnecessary primitive wrappers instance creations by using static factory <code>valueOf()</code> method.
+	 * Replace unnecessary primitive wrappers instance creations by using static factory {@code valueOf()} method.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -775,10 +773,9 @@ public class CleanUpConstants {
 	public static final String VALUEOF_RATHER_THAN_INSTANTIATION= "cleanup.valueof_rather_than_instantiation"; //$NON-NLS-1$
 
 	/**
-	 * Replaces the <code>compareTo()</code> method by a comparison on primitive.
+	 * Replaces the {@code compareTo()} method by a comparison on primitive.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -790,7 +787,6 @@ public class CleanUpConstants {
 	 * Avoids to create primitive wrapper when parsing a string.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -799,10 +795,9 @@ public class CleanUpConstants {
 	public static final String PRIMITIVE_PARSING= "cleanup.primitive_parsing"; //$NON-NLS-1$
 
 	/**
-	 * Replaces a primitive boxing to serialize by a call to the static <code>toString()</code> method.
+	 * Replaces a primitive boxing to serialize by a call to the static {@code toString()} method.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -814,7 +809,6 @@ public class CleanUpConstants {
 	 * Replace wrapper object by primitive type when an object is not necessary.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -911,7 +905,6 @@ public class CleanUpConstants {
 	 * Uses pattern matching for the instanceof operator when possible.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -975,7 +968,6 @@ public class CleanUpConstants {
 	 * method references.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -984,10 +976,9 @@ public class CleanUpConstants {
 	public static final String SIMPLIFY_LAMBDA_EXPRESSION_AND_METHOD_REF= "cleanup.simplify_lambda_expression_and_method_ref"; //$NON-NLS-1$
 
 	/**
-	 * Replaces a plain comparator instance by a lambda expression passed to a <code>Comparator.comparing()</code> method.
+	 * Replaces a plain comparator instance by a lambda expression passed to a {@code Comparator.comparing()} method.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -999,7 +990,6 @@ public class CleanUpConstants {
 	 * Precompiles the regular expressions.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1008,10 +998,9 @@ public class CleanUpConstants {
 	public static final String PRECOMPILE_REGEX= "cleanup.precompile_regex"; //$NON-NLS-1$
 
 	/**
-	 * Invert calls to <code>Object.equals(Object)</code> and <code>String.equalsIgnoreCase(String)</code> when it is known that the second operand is not null and the first can be null.
+	 * Invert calls to {@code Object.equals(Object)} and {@code String.equalsIgnoreCase(String)} when it is known that the second operand is not null and the first can be null.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1023,7 +1012,6 @@ public class CleanUpConstants {
 	 * Check for sign of bitwise operation.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1032,10 +1020,9 @@ public class CleanUpConstants {
 	public static final String CHECK_SIGN_OF_BITWISE_OPERATION= "cleanup.bitwise_conditional_expression"; //$NON-NLS-1$
 
 	/**
-	 * Fixes <code>Comparable.compareTo()</code> usage.
+	 * Fixes {@code Comparable.compareTo()} usage.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1047,7 +1034,6 @@ public class CleanUpConstants {
 	 * Removes a String instance from a String literal.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1059,7 +1045,6 @@ public class CleanUpConstants {
 	 * Refactor access to system properties to use constants or methods
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1069,14 +1054,13 @@ public class CleanUpConstants {
 
 	/**
 	 * Replace
-	 * <code>System.getProperty("file.separator")</code>
+	 * {@code System.getProperty("file.separator")}
 	 * by
 	 * <p>
-	 * <code>File.separator</code><br> or<br>
-	 * <code>FileSystems.getDefault().getSeparator()</code> (Java 7).
+	 * {@code File.separator}<br> or<br>
+	 * {@code FileSystems.getDefault().getSeparator()} (Java 7).
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1085,11 +1069,10 @@ public class CleanUpConstants {
 	public static final String CONSTANTS_FOR_SYSTEM_PROPERTY_FILE_SEPARATOR= "cleanup.system_property_file_separator"; //$NON-NLS-1$
 
 	/**
-	 * Replace <code>System.getProperty("file.encoding")</code> by<p>
-	 * <code>Charset.defaultCharset().displayName()</code>
+	 * Replace {@code System.getProperty("file.encoding")} by<p>
+	 * {@code Charset.defaultCharset().displayName()}
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1098,11 +1081,10 @@ public class CleanUpConstants {
 	public static final String CONSTANTS_FOR_SYSTEM_PROPERTY_FILE_ENCODING= "cleanup.system_property_file_encoding"; //$NON-NLS-1$
 
 	/**
-	 * Replace <code>System.getProperty("path.separator")</code> by<p>
-	 * <code>File.pathSeparator</code>
+	 * Replace {@code System.getProperty("path.separator")} by<p>
+	 * {@code File.pathSeparator}
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1111,11 +1093,10 @@ public class CleanUpConstants {
 	public static final String CONSTANTS_FOR_SYSTEM_PROPERTY_PATH_SEPARATOR= "cleanup.system_property_path_separator"; //$NON-NLS-1$
 
 	/**
-	 * Replace <code>System.getProperty("line.separator")</code> by<p>
-	 * <code>System.lineSeparator()</code>
+	 * Replace {@code System.getProperty("line.separator")} by<p>
+	 * {@code System.lineSeparator()}
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1125,11 +1106,10 @@ public class CleanUpConstants {
 
 	/**
 	 * Replace Boolean/Long/Integer conversions using System properties to methods designed
-	 * for the purpose.  For example, replace: <p><code>Boolean.parseBoolean(System.getProperty("arbitrarykey"))</code></p> by<p>
-	 * <code>Boolean.getBoolean("arbitrarykey")</code>
+	 * for the purpose.  For example, replace: <p>{@code Boolean.parseBoolean(System.getProperty("arbitrarykey"))}</p> by<p>
+	 * {@code Boolean.getBoolean("arbitrarykey")}
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1141,7 +1121,6 @@ public class CleanUpConstants {
 	 * Replaces Boolean.TRUE/Boolean.FALSE by true/false when used as primitive.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1170,7 +1149,6 @@ public class CleanUpConstants {
 	 * Refactors a field into a local variable if its use is only local.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1182,7 +1160,6 @@ public class CleanUpConstants {
 	 * Add a break to avoid passive for loop iterations.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1191,10 +1168,9 @@ public class CleanUpConstants {
 	public static final String BREAK_LOOP= "cleanup.break_loop"; //$NON-NLS-1$
 
 	/**
-	 * Replace <code>while</code> by <code>do</code>/<code>while</code>.
+	 * Replace {@code while} by {@code do}/{@code while}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1203,10 +1179,9 @@ public class CleanUpConstants {
 	public static final String DO_WHILE_RATHER_THAN_WHILE= "cleanup.do_while_rather_than_while"; //$NON-NLS-1$
 
 	/**
-	 * Make inner <code>class</code> static.
+	 * Make inner {@code class} static.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1218,7 +1193,6 @@ public class CleanUpConstants {
 	 * Replaces String concatenation by StringBuilder when possible.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1233,7 +1207,6 @@ public class CleanUpConstants {
 	 * {@link #STRINGBUFFER_TO_STRINGBUILDER_FOR_LOCALS}<br>
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1290,7 +1263,6 @@ public class CleanUpConstants {
 	 * Replace deprecated method call with specified replacement if possible.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1299,10 +1271,9 @@ public class CleanUpConstants {
 	public static final String REPLACE_DEPRECATED_CALLS= "cleanup.replace_deprecated_calls"; //$NON-NLS-1$
 
 	/**
-	 * Replaces <code>String.replaceAll()</code> by <code>String.replace()</code>.
+	 * Replaces {@code String.replaceAll()} by {@code String.replace()}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1312,12 +1283,11 @@ public class CleanUpConstants {
 
 	/**
 	 * Replace
-	 * <code>s.strip().length() == 0</code>
+	 * {@code s.strip().length() == 0}
 	 * by
-	 * <code>s.isBlank()</code> (Java 11).
+	 * {@code s.isBlank()} (Java 11).
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1499,7 +1469,6 @@ public class CleanUpConstants {
 	 * Rewrites Eclipse-autogenerated hashcode method by Eclipse-autogenerated hashcode method for Java 7.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1520,10 +1489,9 @@ public class CleanUpConstants {
 	public static final String REMOVE_REDUNDANT_MODIFIERS= "cleanup.remove_redundant_modifiers"; //$NON-NLS-1$
 
 	/**
-	 * Removes the second <code>substring()</code> parameter if this parameter is the length of the string.
+	 * Removes the second {@code substring()} parameter if this parameter is the length of the string.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1535,7 +1503,6 @@ public class CleanUpConstants {
 	 * Replaces for loops to use String.join() where possible.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1547,7 +1514,6 @@ public class CleanUpConstants {
 	 * Replaces a for loop on an array that assigns the same value by a call to Arrays.fill().
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1559,7 +1525,6 @@ public class CleanUpConstants {
 	 * Removes redundant null checks.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1571,7 +1536,6 @@ public class CleanUpConstants {
 	 * Raises embedded if into parent if.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1616,10 +1580,9 @@ public class CleanUpConstants {
 	public static final String PUSH_DOWN_NEGATION= "cleanup.push_down_negation"; //$NON-NLS-1$
 
 	/**
-	 * Directly checks boolean values instead of comparing them with <code>true</code>/<code>false</code>.
+	 * Directly checks boolean values instead of comparing them with {@code true}/{@code false}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1631,7 +1594,6 @@ public class CleanUpConstants {
 	 * Reduces double negation in boolean expression.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1643,7 +1605,6 @@ public class CleanUpConstants {
 	 * Removes useless bad value checks before assignments or return statements.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1655,7 +1616,6 @@ public class CleanUpConstants {
 	 * Remove super() call in constructor.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1664,10 +1624,9 @@ public class CleanUpConstants {
 	public static final String REDUNDANT_SUPER_CALL= "cleanup.no_super"; //$NON-NLS-1$
 
 	/**
-	 * Detect two successive <code>if</code> conditions that are identical and remove the second one.
+	 * Detect two successive {@code if} conditions that are identical and remove the second one.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1676,10 +1635,9 @@ public class CleanUpConstants {
 	public static final String UNREACHABLE_BLOCK= "cleanup.unreachable_block"; //$NON-NLS-1$
 
 	/**
-	 * Replaces (X && Y) || (X && Z) by (X && (Y || Z)).
+	 * Replaces {@code (X && Y) || (X && Z) by (X && (Y || Z))}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1688,10 +1646,9 @@ public class CleanUpConstants {
 	public static final String OPERAND_FACTORIZATION= "cleanup.operand_factorization"; //$NON-NLS-1$
 
 	/**
-	 * Replaces (X && Y) || (!X && Z) by X ? Y : Z.
+	 * Replaces {@code (X && Y) || (!X && Z) by X ? Y : Z}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1700,11 +1657,10 @@ public class CleanUpConstants {
 	public static final String TERNARY_OPERATOR= "cleanup.ternary_operator"; //$NON-NLS-1$
 
 	/**
-	 * Replaces <code>(X && !Y) || (!X && Y)</code> by <code>X ^ Y</code>.
-	 * Replaces also <code>(X && Y) || (!X && !Y)</code> by <code>X == Y</code>.
+	 * Replaces {@code (X && !Y) || (!X && Y)} by {@code X ^ Y}.
+	 * Replaces also {@code (X && Y) || (!X && !Y)} by {@code X == Y}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1716,7 +1672,6 @@ public class CleanUpConstants {
 	 * Merge conditions of if/else if/else that have the same blocks.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1729,7 +1684,6 @@ public class CleanUpConstants {
 	 * Ultimately it removes the empty and passive if conditions.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1738,10 +1692,9 @@ public class CleanUpConstants {
 	public static final String CONTROLFLOW_MERGE= "cleanup.controlflow_merge"; //$NON-NLS-1$
 
 	/**
-	 * Merge consecutive <code>if</code> statements with same code block that end with a jump statement.
+	 * Merge consecutive {@code if} statements with same code block that end with a jump statement.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1750,10 +1703,9 @@ public class CleanUpConstants {
 	public static final String ONE_IF_RATHER_THAN_DUPLICATE_BLOCKS_THAT_FALL_THROUGH= "cleanup.one_if_rather_than_duplicate_blocks_that_fall_through"; //$NON-NLS-1$
 
 	/**
-	 * Moves an inner <code>if</code> statement around the outer <code>if</code> condition.
+	 * Moves an inner {@code if} statement around the outer {@code if} condition.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1765,7 +1717,6 @@ public class CleanUpConstants {
 	 * Merges blocks that end with a jump statement into the following same code.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1777,7 +1728,6 @@ public class CleanUpConstants {
 	 * Remove a condition on an else that is negative to the condition of the previous if.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1801,7 +1751,6 @@ public class CleanUpConstants {
 	 * Replaces creating a new Collection, then invoking Collection.addAll() on it, by creating the new Collection with the other Collection as parameter.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1813,7 +1762,6 @@ public class CleanUpConstants {
 	 * Replaces creating a new Map, then invoking Map.putAll() on it, by creating the new Map with the other Map as parameter.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1825,7 +1773,6 @@ public class CleanUpConstants {
 	 * Remove passive assignment when the variable is reassigned before being read.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1838,7 +1785,6 @@ public class CleanUpConstants {
 	 * if necessary.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1862,7 +1808,6 @@ public class CleanUpConstants {
 	 * Remove the comparator declaration if it is the default one.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1886,7 +1831,6 @@ public class CleanUpConstants {
 	 * Replace the new instance syntax by curly brackets to create an array.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1898,7 +1842,6 @@ public class CleanUpConstants {
 	 * Removes unnecessary local variable declaration or unnecessary variable assignment before a return statement.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1910,7 +1853,6 @@ public class CleanUpConstants {
 	 * Removes useless lone return at the end of a method.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1922,7 +1864,6 @@ public class CleanUpConstants {
 	 * Removes useless lone continue at the end of a loop.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1931,10 +1872,9 @@ public class CleanUpConstants {
 	public static final String REMOVE_USELESS_CONTINUE= "cleanup.useless_continue"; //$NON-NLS-1$
 
 	/**
-	 * Replaces a <code>while</code> loop that always terminates during the first iteration by an <code>if</code>.
+	 * Replaces a {@code while} loop that always terminates during the first iteration by an {@code if}.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1946,7 +1886,6 @@ public class CleanUpConstants {
 	 * Replaces a loop on elements by Collection.addAll(), Collection.addAll(Arrays.asList()) or Collections.addAll().
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -1958,7 +1897,6 @@ public class CleanUpConstants {
 	 * Reduces the code of the equals method implementation by using Objects.equals().
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2110,7 +2048,6 @@ public class CleanUpConstants {
 	 * Moves increment or decrement outside an expression when possible.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2122,7 +2059,6 @@ public class CleanUpConstants {
 	 * Moves assignments inside an if condition above the if node.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2131,10 +2067,9 @@ public class CleanUpConstants {
 	public static final String PULL_UP_ASSIGNMENT= "cleanup.pull_up_assignment"; //$NON-NLS-1$
 
 	/**
-	 * Uses the <code>else if</code> pseudo keyword.
+	 * Uses the {@code else if} pseudo keyword.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2146,7 +2081,6 @@ public class CleanUpConstants {
 	 * Removes useless indentation when the opposite workflow falls through.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2155,10 +2089,9 @@ public class CleanUpConstants {
 	public static final String REDUCE_INDENTATION= "cleanup.reduce_indentation"; //$NON-NLS-1$
 
 	/**
-	 * Uses an <code>instanceof</code> expression to check an object against a hardcoded class.
+	 * Uses an {@code instanceof} expression to check an object against a hardcoded class.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2259,7 +2192,6 @@ public class CleanUpConstants {
 	 * Changes code to make use of Java 7 try-with-resources feature. In particular, it removes now useless finally clauses.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2268,10 +2200,9 @@ public class CleanUpConstants {
 	public static final String TRY_WITH_RESOURCE= "cleanup.try_with_resource"; //$NON-NLS-1$
 
 	/**
-	 * Refactors <code>catch</code> clauses with the same body to use Java 7's multi-catch.
+	 * Refactors {@code catch} clauses with the same body to use Java 7's multi-catch.
 	 * <p>
 	 * Possible values: {TRUE, FALSE}
-	 * <p>
 	 *
 	 * @see CleanUpOptions#TRUE
 	 * @see CleanUpOptions#FALSE
@@ -2282,8 +2213,8 @@ public class CleanUpConstants {
 	/**
 	 * Should the Clean Up Wizard be shown when executing the Clean Up Action? <br>
 	 * <br>
-	 * Possible values: {<code><b>true</b></code>, <code><b>false</b></code>} <br>
-	 * Default value: <code><b>true</b></code><br>
+	 * Possible values: {@code <b>true</b>}, {@code <b>false</b>} <br>
+	 * Default value: {@code <b>true</b>}<br>
 	 * <br>
 	 *
 	 * @since 3.3
@@ -2291,7 +2222,7 @@ public class CleanUpConstants {
 	public static final String SHOW_CLEAN_UP_WIZARD= "cleanup.showwizard"; //$NON-NLS-1$
 
 	/**
-	 * A key to a serialized string in the <code>InstanceScope</code> containing all the profiles.<br>
+	 * A key to a serialized string in the {@code InstanceScope} containing all the profiles.<br>
 	 * Following code snippet can load the profiles:
 	 *
 	 * <pre>
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/base/JavaStringStatusContext.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/base/JavaStringStatusContext.java
index f0e924ba19d..d84cc69398a 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/base/JavaStringStatusContext.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/base/JavaStringStatusContext.java	
@@ -21,7 +21,7 @@
 import org.eclipse.jdt.core.ISourceRange;
 
 /**
- * A Java string context can be used to annotate a </code>RefactoringStatusEntry<code>
+ * A Java string context can be used to annotate a <code>RefactoringStatusEntry</code>
  * with detailed information about an error detected in Java source code represented
  * by a string.
  */
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/ImportRewriteUtil.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/ImportRewriteUtil.java
index 752dad7a3a0..9c5e43f7b48 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/ImportRewriteUtil.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/ImportRewriteUtil.java	
@@ -46,8 +46,8 @@ public final class ImportRewriteUtil {
 	 * @param rewrite the compilation unit rewrite whose compilation unit's imports should be updated
 	 * @param context the import rewrite context, or <code>null</code> if none available
 	 * @param node the AST node specifying the element for which imports should be added
-	 * @param typeImports the map of name nodes to strings (element type: Map <Name, String>).
-	 * @param staticImports the map of name nodes to strings (element type: Map <Name, String>).
+	 * @param typeImports the map of name nodes to strings (element type: {@code Map <Name, String>}).
+	 * @param staticImports the map of name nodes to strings (element type: {@code Map <Name, String>}).
 	 * @param declarations <code>true</code> if method declarations are treated as abstract, <code>false</code> otherwise
 	 */
 	public static void addImports(final CompilationUnitRewrite rewrite, ImportRewriteContext context, final ASTNode node, final Map<Name, String> typeImports, final Map<Name, String> staticImports, final boolean declarations) {
@@ -60,8 +60,8 @@ public static void addImports(final CompilationUnitRewrite rewrite, ImportRewrit
 	 * @param rewrite the compilation unit rewrite whose compilation unit's imports should be updated
 	 * @param context the import rewrite context, or <code>null</code> if none available
 	 * @param node the AST node specifying the element for which imports should be added
-	 * @param typeImports the map of name nodes to strings (element type: Map <Name, String>).
-	 * @param staticImports the map of name nodes to strings (element type: Map <Name, String>).
+	 * @param typeImports the map of name nodes to strings (element type: {@code Map <Name, String>}).
+	 * @param staticImports the map of name nodes to strings (element type: {@code Map <Name, String>}).
 	 * @param excludeBindings the set of bindings to exclude (element type: Set <IBinding>).
 	 * @param declarations <code>true</code> if method declarations are treated as abstract, <code>false</code> otherwise
 	 */
@@ -116,8 +116,8 @@ public static void addImports(final CompilationUnitRewrite rewrite, ImportRewrit
 	 *
 	 * @param project the java project containing the element
 	 * @param node the AST node specifying the element for which imports should be collected
-	 * @param typeBindings the set of type bindings (element type: Set <ITypeBinding>).
-	 * @param staticBindings the set of bindings (element type: Set <IBinding>).
+	 * @param typeBindings the set of type bindings (element type: {@code Set <ITypeBinding>}).
+	 * @param staticBindings the set of bindings (element type: {@code Set <IBinding>}).
 	 * @param declarations <code>true</code> if method declarations are treated as abstract, <code>false</code> otherwise
 	 */
 	public static void collectImports(final IJavaProject project, final ASTNode node, final Collection<ITypeBinding> typeBindings, final Collection<IBinding> staticBindings, final boolean declarations) {
@@ -129,9 +129,9 @@ public static void collectImports(final IJavaProject project, final ASTNode node
 	 *
 	 * @param project the java project containing the element
 	 * @param node the AST node specifying the element for which imports should be collected
-	 * @param typeBindings the set of type bindings (element type: Set <ITypeBinding>).
-	 * @param staticBindings the set of bindings (element type: Set <IBinding>).
-	 * @param excludeBindings the set of bindings to exclude (element type: Set <IBinding>).
+	 * @param typeBindings the set of type bindings (element type: {@code Set <ITypeBinding>}).
+	 * @param staticBindings the set of bindings (element type: {@code Set <IBinding>}).
+	 * @param excludeBindings the set of bindings to exclude (element type: {@code Set <IBinding>}).
 	 * @param declarations <code>true</code> if method declarations are treated as abstract, <code>false</code> otherwise
 	 */
 	public static void collectImports(final IJavaProject project, final ASTNode node, final Collection<ITypeBinding> typeBindings, final Collection<IBinding> staticBindings, final Collection<IBinding> excludeBindings, final boolean declarations) {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java
index 9aa84745c10..2f80a7a621f 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java	
@@ -973,7 +973,7 @@ else if (referencedUnit != null && referencedUnit.getParent().equals(unit.getPar
 	}
 
 	/**
-	 * Returns the existing visibility adjustments (element type: Map <IMember, IVisibilityAdjustment>).
+	 * Returns the existing visibility adjustments (element type: {@code Map <IMember, IVisibilityAdjustment>}).
 	 *
 	 * @return the visibility adjustments
 	 */
@@ -1097,7 +1097,7 @@ public void rewriteVisibility(final IProgressMonitor monitor) throws JavaModelEx
 	}
 
 	/**
-	 * Sets the existing visibility adjustments to be taken into account (element type: Map <IMember, IVisibilityAdjustment>).
+	 * Sets the existing visibility adjustments to be taken into account (element type: {@code Map <IMember, IVisibilityAdjustment>}).
 	 * <p>
 	 * This method must be called before calling {@link MemberVisibilityAdjustor#adjustVisibility(IProgressMonitor)}. The default is to take no existing adjustments into account.
 	 *
@@ -1156,7 +1156,7 @@ public void setRewrite(final ASTRewrite rewrite, final CompilationUnit root) {
 	}
 
 	/**
-	 * Sets the compilation unit rewrites used by this adjustor (element type: Map <ICompilationUnit, CompilationUnitRewrite>).
+	 * Sets the compilation unit rewrites used by this adjustor (element type: {@code Map <ICompilationUnit, CompilationUnitRewrite>}).
 	 * <p>
 	 * This method must be called before calling {@link MemberVisibilityAdjustor#adjustVisibility(IProgressMonitor)}. The default is to use no existing rewrites.
 	 *
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavaStatusContext.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavaStatusContext.java
index b65ee43f785..ea86e5604e5 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavaStatusContext.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavaStatusContext.java	
@@ -30,7 +30,7 @@
 import org.eclipse.jdt.internal.corext.dom.Selection;
 
 /**
- * A Java element context that can be used to annotate a </code>RefactoringStatusEntry<code>
+ * A Java element context that can be used to annotate a <code>RefactoringStatusEntry</code>
  * with detailed information about an error detected in an <code>IJavaElement</code>.
  */
 public abstract class JavaStatusContext extends RefactoringStatusContext {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavadocUtil.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavadocUtil.java
index 0492e6f9508..285d45a248d 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavadocUtil.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/JavadocUtil.java	
@@ -78,7 +78,7 @@ public static TagElement createParamTag(String parameterName, AST ast, IJavaProj
 	/**
 	 * Decide whether to add a "param" javadoc tag or not.
 	 * @param methodDeclaration the method declaration
-	 * @return method has javadoc && (method had no parameter before || there is already an @param tag)
+	 * @return method has javadoc {@code &&} (method had no parameter before || there is already an {@code @param} tag)
 	 */
 	public static boolean shouldAddParamJavadoc(MethodDeclaration methodDeclaration) {
 		Javadoc javadoc= methodDeclaration.getJavadoc();
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextChangeManager.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextChangeManager.java
index 2092a419b79..e8abdd83ff4 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextChangeManager.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextChangeManager.java	
@@ -72,11 +72,11 @@ public TextChange get(ICompilationUnit cu) {
 	}
 
 	/**
-	 * Removes the <tt>TextChange</tt> managed under the given key
-	 * <code>unit<code>.
+	 * Removes the <code>TextChange</code> managed under the given key
+	 * <code>unit</code>.
 	 *
 	 * @param unit the key determining the <tt>TextChange</tt> to be removed.
-	 * @return the removed <tt>TextChange</tt>.
+	 * @return the removed <code>TextChange</code>.
 	 */
 	public TextChange remove(ICompilationUnit unit) {
 		return fMap.remove(unit);
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditBasedChangeManager.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditBasedChangeManager.java
index a5f68a6b9c6..85e79de81b3 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditBasedChangeManager.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditBasedChangeManager.java	
@@ -72,11 +72,11 @@ public TextEditBasedChange get(ICompilationUnit cu) {
 	}
 
 	/**
-	 * Removes the <tt>TextEditBasedChange</tt> managed under the given key
-	 * <code>unit<code>.
+	 * Removes the <code>TextEditBasedChange</code> managed under the given key
+	 * <code>unit</code>.
 	 *
-	 * @param unit the key determining the <tt>TextEditBasedChange</tt> to be removed.
-	 * @return the removed <tt>TextEditBasedChange</tt>.
+	 * @param unit the key determining the <code>TextEditBasedChange</code> to be removed.
+	 * @return the removed <code>TextEditBasedChange</code>.
 	 */
 	public TextEditBasedChange remove(ICompilationUnit unit) {
 		return fMap.remove(unit);
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditUtil.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditUtil.java
index 4e993604d5c..0d6657e5bcd 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditUtil.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/util/TextEditUtil.java	
@@ -48,7 +48,6 @@ public static void insert(TextEdit parent, TextEdit edit) {
 	 *   </ul>
 	 * </li>
 	 * </ul>
-	 * </p>
 	 *
 	 * @param edit the edit to verify
 	 * @return true if edit is minimal
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/ControlWorkflowMatcher.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/ControlWorkflowMatcher.java
index 592a0727a54..a84106d5b0d 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/ControlWorkflowMatcher.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/ControlWorkflowMatcher.java	
@@ -66,7 +66,7 @@
  * The conditions and the expressions are analyzed as ordinary matcher using <code>org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher</code>.
  * All the remaining part of the structure may have lots of different forms:
  *
- * <pre>
+ * <pre>{@code
  * if (c1 && c2) {
  *     return A;
  * } else if (c1 && not c2) {
@@ -76,9 +76,9 @@
  * } else if (not c1 && c3) {
  *     return C;
  * }
- * </pre>
+ * }</pre>
  *
- * <pre>
+ * <pre>{@code
  * if (c1) {
  *   if (c2) {
  *     return A;
@@ -90,9 +90,9 @@
  *   }
  *   return D;
  * }
- * </pre>
+ * }</pre>
  *
- * <pre>
+ * <pre>{@code
  * if (c1) {
  *   if (not c2) {
  *     return B;
@@ -106,9 +106,9 @@
  *     return C;
  *   }
  * }
- * </pre>
+ * }</pre>
  *
- * <pre>
+ * <pre>{@code
  * if (c1) {
  *   return c2 ? A : B;
  * } else {
@@ -120,7 +120,7 @@
  * }
  *
  * return not c2 ? A : B;
- * </pre>
+ * }</pre>
  */
 public final class ControlWorkflowMatcher implements ControlWorkflowMatcherCompletable, ControlWorkflowMatcherRunnable {
 	/**
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/LRUMap.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/LRUMap.java
index dc7c0f76515..abeaf896665 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/LRUMap.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/LRUMap.java	
@@ -21,8 +21,8 @@
  * Least-recently-used cache. When the map tops the maximum size configured in the constructor, it
  * automatically removes the oldest entry in terms of last access.
  * <p>
- * Invoking the <tt>put</tt> or <tt>get</tt> method results in an access to the corresponding entry.
- * The <tt>putAll</tt> method generates one entry access for each mapping in the specified map, in
+ * Invoking the <code>put</code> or <code>get</code> method results in an access to the corresponding entry.
+ * The <code>putAll</code> method generates one entry access for each mapping in the specified map, in
  * the order that key-value mappings are provided by the specified map's entry set iterator. <i>No
  * other methods generate entry accesses.</i> In particular, operations on collection-views do
  * <i>not</i> affect the order of iteration of the backing map.
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java
index acddba41d20..3f67847bd8d 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/Resources.java	
@@ -82,7 +82,7 @@ public static IStatus checkInSync(IResource[] resources) {
 	/**
 	 * Makes the given resource committable. Committable means that it is
 	 * writeable and that its content hasn't changed by calling
-	 * <code>validateEdit</code> for the given resource on <tt>IWorkspace</tt>.
+	 * <code>validateEdit</code> for the given resource on <code>IWorkspace</code>.
 	 *
 	 * @param resource the resource to be checked
 	 * @param context the context passed to <code>validateEdit</code>
@@ -98,7 +98,7 @@ public static IStatus makeCommittable(IResource resource, Object context) {
 	 * Makes the given resources committable. Committable means that all
 	 * resources are writeable and that the content of the resources hasn't
 	 * changed by calling <code>validateEdit</code> for a given file on
-	 * <tt>IWorkspace</tt>.
+	 * <code>IWorkspace</code>.
 	 *
 	 * @param resources the resources to be checked
 	 * @param context the context passed to <code>validateEdit</code>
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SearchUtils.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SearchUtils.java
index 23bf0bce558..f56b4a4a23c 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SearchUtils.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/SearchUtils.java	
@@ -68,7 +68,7 @@ public static SearchParticipant[] getDefaultSearchParticipants() {
     /**
      * Returns whether the given pattern is a camel case pattern or not.
      * <em>Note: this method does not consider the
-     * {@link SearchPattern#R_CAMELCASE_SAME_PART_COUNT_MATCH} variant.<em>
+     * {@link SearchPattern#R_CAMELCASE_SAME_PART_COUNT_MATCH} variant.</em>
      *
      * @param pattern the pattern to inspect
      * @return whether it is a camel case pattern or not
diff --git a/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java b/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
index b4699b2e516..791a7e8c09b 100644
--- a/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
+++ b/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
@@ -1449,9 +1449,9 @@ public String getTarget() {
 	}
 
 	/**
-	 * Returns the Collection<String> of names of types that can be given to the selected declaration.
+	 * Returns the {@code Collection<String>} of names of types that can be given to the selected declaration.
 	 * (used in tests only)
-	 * @return Collection<String> of names of types that can be given to the selected declaration
+	 * @return {@code Collection<String>} of names of types that can be given to the selected declaration
 	 */
 	public Collection<String> getValidTypeNames() {
 		Collection<String> typeNames= new ArrayList<>();