diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
index db6ca6a0c9..a639b3b272 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 	/**
 	 * Default order of Spring Security's Filter in the servlet container (i.e. amongst
 	 * other filters registered with the container). There is no connection between this
-	 * and the <code>@Order</code> on a WebSecurityConfigurer.
+	 * and the {@code @Order} on a WebSecurityConfigurer.
 	 */
 	public static final int DEFAULT_FILTER_ORDER = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER
 			- 100;
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java
index 938a61a77f..d55faed774 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java
@@ -67,8 +67,7 @@ public abstract class GenericBomAstTransformation
 
 	/**
 	 * The bom to be added to dependency management in compact form:
-	 * <code>"&lt;groupId&gt;:&lt;artifactId&gt;:&lt;version&gt;"</code> (like in a
-	 * {@code @Grab}).
+	 * {@code "<groupId>:<artifactId>:<version>"} (like in a {@code @Grab}).
 	 * @return the maven co-ordinates of the BOM to add
 	 */
 	protected abstract String getBomModule();
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java
index 2a1e3a5abd..cfab0a2eb9 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java
@@ -26,7 +26,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * A {@link TestExecutionListener} for Spring REST Docs that removes the need for a
- * <code>@Rule</code> when using JUnit or manual before and after test calls when using
+ * {@code @Rule} when using JUnit or manual before and after test calls when using
  * TestNG.
  *
  * @author Andy Wilkinson
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
index f1b011736f..a7490f28c9 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
@@ -144,9 +144,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 
 	/**
 	 * A list of the libraries that must be unpacked from fat jars in order to run.
-	 * Specify each library as a <code>&lt;dependency&gt;</code> with a
-	 * <code>&lt;groupId&gt;</code> and a <code>&lt;artifactId&gt;</code> and they will be
-	 * unpacked at runtime.
+	 * Specify each library as a {@code <dependency>} with a {@code <groupId>} and
+	 * a {@code <artifactId>} and they will be unpacked at runtime.
 	 * @since 1.1
 	 */
 	@Parameter
@@ -157,10 +156,10 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 	 * jar.
 	 * <p>
 	 * Currently, some tools do not accept this format so you may not always be able to
-	 * use this technique. For example, <code>jar -xf</code> may silently fail to extract
+	 * use this technique. For example, {@code jar -xf} may silently fail to extract
 	 * a jar or war that has been made fully-executable. It is recommended that you only
 	 * enable this option if you intend to execute it directly, rather than running it
-	 * with <code>java -jar</code> or deploying it to a servlet container.
+	 * with {@code java -jar} or deploying it to a servlet container.
 	 * @since 1.3
 	 */
 	@Parameter(defaultValue = "false")