diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java
index 47f14b8b5..f2ebd9ac9 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Exceptions.java
@@ -30,7 +30,7 @@ public class Exceptions {
 	/**
 	 * Invoke {@code Throwable#addSuppressed(Throwable)} reflectively if it is available.
 	 * 
-	 * It is not available on JRE < 1.7
+	 * It is not available on JRE &lt; 1.7
 	 * 
 	 * @since 2.8
 	 */
diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java
index e2d4a40a6..d89dc6cf9 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/PolymorphicDispatcher.java
@@ -210,11 +210,11 @@ public class PolymorphicDispatcher<RT> {
 	}
 
 	/**
-	 * returns > 0 when o1 is more specific than o2,
+	 * returns &gt; 0 when o1 is more specific than o2,
 	 * 
 	 * returns == 0 when o1 and o2 are equal or unrelated,
 	 * 
-	 * returns < 0 when o2 is more specific than o1,
+	 * returns &lt; 0 when o2 is more specific than o1,
 	 */
 	protected int compare(MethodDesc o1, MethodDesc o2) {
 		final Class<?>[] paramTypes1 = o1.getParameterTypes();
diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java
index fb17d0c1c..a6c6ef5ee 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/SimpleCache.java
@@ -22,7 +22,7 @@ import com.google.common.base.Function;
  * Attention: The algorithm may not depend on itself in a circular manner. E.g. the following will lead 
  * to a stack overflow:
  * <pre>
- * SimpleCache<K, V> cache = new SimpleCache<K, V>(new Function<K, V>() {
+ * SimpleCache&lt;K, V&gt; cache = new SimpleCache&lt;K, V&gt;(new Function&lt;K, V&gt;() {
  *   public V apply(K k) {
  *     // DON'T DO THIS
  *     if (k == k1) {
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java
index ce3ec2024..a50f36279 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java
@@ -456,10 +456,10 @@ public abstract class AbstractTraceRegion {
 	 * <code>r1</code> and <code>r2</code> are considered to be equal if
 	 * 
 	 * <pre>
-	 * (r1.getMyOffset() == r2.getMyOffset()) && (r1.getMyLength() == r2.getMyLength())
-	 * 		&& (r1.getAssociatedOffset() == r2.getAssociatedOffset())
-	 * 		&& (r1.getAssociatedLength() == r2.getAssociatedLength())
-	 * 		&& (r1.getParent() == null ? r2.getParent() == null : r1.getParent().equals(r2.getParent()))
+	 * (r1.getMyOffset() == r2.getMyOffset()) &amp;&amp; (r1.getMyLength() == r2.getMyLength())
+	 * 		&amp;&amp; (r1.getAssociatedOffset() == r2.getAssociatedOffset())
+	 * 		&amp;&amp; (r1.getAssociatedLength() == r2.getAssociatedLength())
+	 * 		&amp;&amp; (r1.getParent() == null ? r2.getParent() == null : r1.getParent().equals(r2.getParent()))
 	 * </pre>
 	 * 
 	 * This ensures that the {@link #equals(Object)} method works properly across different implementations of the
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java
index 9b2a2b7b6..4fd20756a 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java
@@ -56,8 +56,8 @@ public class NodeModelUtils extends InternalNodeModelUtils {
 	 * 
 	 * A node matches the <code>leafNodeOffset</code> if it fulfills the following condition:
 	 * <pre>
-	 *  node.totalOffset <= leafNodeOffset &&
-	 *  node.totalEndOffset > leafNodeOffset 
+	 *  node.totalOffset &lt;= leafNodeOffset &amp;&amp;
+	 *  node.totalEndOffset &gt; leafNodeOffset 
 	 * </pre>
 	 * 
 	 * @param node the container node. May not be <code>null</code>.
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java
index fb4ccf2bd..e7e98f551 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/ITransientValueService.java
@@ -32,7 +32,7 @@ public interface ITransientValueService {
 	 * Decides whether a value should be serialized.
 	 * 
 	 * If !feature.isMany() or !isMixedList(feature), this method is only called once for each feature. In this case,
-	 * index is < 0.
+	 * index is &lt; 0.
 	 * 
 	 * If feature.isMany() and isMixedList(feature), this method is called for each of the feature's values.
 	 *