Merge branch '5.2.x'

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) {