diff --git a/core-common/src/main/java/org/mapstruct/DecoratedWith.java b/core-common/src/main/java/org/mapstruct/DecoratedWith.java
index 2f3dcf0fd..4dd6e66ee 100644
--- a/core-common/src/main/java/org/mapstruct/DecoratedWith.java
+++ b/core-common/src/main/java/org/mapstruct/DecoratedWith.java
@@ -38,7 +38,6 @@ import java.lang.annotation.Target;
  * <p>
  * <b>NOTE:</b> The decorator feature when used with component model {@code jsr330} is considered <em>experimental</em>
  * and it may change in future releases.
- * <p>
  * <h2>Examples</h2>
  * <p>
  * For the examples below, consider the following mapper declaration:
diff --git a/core-jdk8/src/main/java/org/mapstruct/Mapping.java b/core-jdk8/src/main/java/org/mapstruct/Mapping.java
index c7e4b0d83..995473eb9 100644
--- a/core-jdk8/src/main/java/org/mapstruct/Mapping.java
+++ b/core-jdk8/src/main/java/org/mapstruct/Mapping.java
@@ -99,15 +99,13 @@ public @interface Mapping {
      * An expression {@link String} based on which the specified target property is to be set.
      * <p>
      * Currently, Java is the only supported "expression language" and expressions must be given in form of Java
-     * expressions using the following format: {@code java(<EXPRESSION>)}. For instance the mapping
-     * <p>
-     *
-     * <pre>
-     * {@code @Mapping(
+     * expressions using the following format: {@code java(<EXPRESSION>)}. For instance the mapping:
+     * <pre><code>
+     * &#64;Mapping(
      *     target = "someProp",
      *     expression = "java(new TimeAndFormat( s.getTime(), s.getFormat() ))"
-     * )}
-     * </pre>
+     * )
+     * </code></pre>
      * <p>
      * will cause the following target property assignment to be generated:
      * <p>
diff --git a/core/src/main/java/org/mapstruct/Mapping.java b/core/src/main/java/org/mapstruct/Mapping.java
index 7cdb05d12..3728f1785 100644
--- a/core/src/main/java/org/mapstruct/Mapping.java
+++ b/core/src/main/java/org/mapstruct/Mapping.java
@@ -97,15 +97,13 @@ public @interface Mapping {
      * An expression {@link String} based on which the specified target property is to be set.
      * <p>
      * Currently, Java is the only supported "expression language" and expressions must be given in form of Java
-     * expressions using the following format: {@code java(<EXPRESSION>)}. For instance the mapping
-     * <p>
-     *
-     * <pre>
-     * {@code @Mapping(
+     * expressions using the following format: {@code java(<EXPRESSION>)}. For instance the mapping:
+     * <pre><code>
+     * &#64;Mapping(
      *     target = "someProp",
      *     expression = "java(new TimeAndFormat( s.getTime(), s.getFormat() ))"
-     * )}
-     * </pre>
+     * )
+     * </code></pre>
      * <p>
      * will cause the following target property assignment to be generated:
      * <p>