diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 1e8c165aa49d..2772207c4503 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -18,7 +18,8 @@ dependencies {
 	implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
 	implementation("commons-codec:commons-codec:1.13")
 	implementation("org.apache.maven:maven-embedder:3.6.2")
-	implementation("org.asciidoctor:asciidoctor-gradle-jvm:2.4.0")
+	implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.0.0")
+	implementation("org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.0.0")
 	implementation("org.springframework:spring-core:5.2.2.RELEASE")
 	implementation("org.springframework:spring-web:5.2.2.RELEASE")
 	implementation("com.google.code.gson:gson:2.8.5")
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java
index a2692818433c..0abdfdbf29f8 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java
@@ -74,7 +74,7 @@ private void writeDescription(AsciidocBuilder builder) {
 			builder.append("|");
 		}
 		else {
-			String cleanedDescription = this.description.replace("|", "\\|");
+			String cleanedDescription = this.description.replace("|", "\\|").replace("<", "&lt;").replace(">", "&gt;");
 			builder.append("|+++", cleanedDescription, "+++");
 		}
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
index 7f0f6e246a89..adfe5bcfab41 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
@@ -89,7 +89,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 	private String password;
 
 	/**
-	 * JNDI location of the datasource. Class, url, username & password are ignored when
+	 * JNDI location of the datasource. Class, url, username and password are ignored when
 	 * set.
 	 */
 	private String jndiName;
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
index ec7991564f71..c7e1f049ae8e 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@@ -6916,7 +6916,7 @@ NOTE: Make sure to not use the regular `@Import` annotation to import auto-confi
 
 [[boot-features-testing-spring-boot-applications-testing-user-configuration]]
 ==== User Configuration and Slicing
-If you <<using-boot-structuring-your-code, structure your code>> in a sensible way, your `@SpringBootApplication` class is <<boot-features-testing-spring-boot-applications-detecting-config, used by default>> as the configuration of your tests.
+If you <<using-spring-boot.adoc#using-boot-structuring-your-code, structure your code>> in a sensible way, your `@SpringBootApplication` class is <<boot-features-testing-spring-boot-applications-detecting-config, used by default>> as the configuration of your tests.
 
 It then becomes important not to litter the application's main class with configuration settings that are specific to a particular area of its functionality.