diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index ba474daef0..500644e29b 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -137,7 +137,11 @@ asciidoctorj {
 			sectnums: '',
 			'source-highlighter': 'highlight.js',
 			highlightjsdir: 'js/highlight',
+<<<<<<< HEAD
 			'highlightjs-theme': 'googlecode',
+=======
+			'highlightjs-theme': 'github', // 'googlecode',
+>>>>>>> 5.2.x
 			stylesdir: 'css/',
 			stylesheet: 'stylesheet.css',
 			'spring-version': project.version
@@ -194,10 +198,10 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from (api) {
 		into "javadoc-api"
 	}
-	from ("$asciidoctor.outputDir/html5") {
+	from ("$asciidoctor.outputDir") {
 		into "reference/html"
 	}
-	from ("$asciidoctor.outputDir/pdf") {
+	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
 	from (dokka) {
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index d91c37ad3d..0e638edafe 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -8441,6 +8441,7 @@ Spring MVC Test's own tests include
 https://github.com/spring-projects/spring-framework/tree/master/spring-test/src/test/java/org/springframework/test/web/client/samples[example
 tests] of client-side REST tests.
 
+include::testing/testing-webtestclient.adoc[leveloffset=+2]
 
 
 [[testing-resources]]