Merge branch '2.5.x'

Closes gh-26892
2021-06-14 13:33:19 +01:00
parent 6982bbdc2b 5f26fd9ccb
commit bc715c64b1
6 changed files with 9 additions and 4 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
@@ -1,3 +1,4 @@
+:!version-label:
 :doctype: book
 :idprefix:
 :idseparator: -
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
@@ -1,12 +1,11 @@
 [[index]]
 = Spring Boot Reference Documentation
 include::authors.adoc[]
+v{spring-boot-version}
 include::attributes.adoc[]



-*{spring-boot-version}*
-
 The reference documentation consists of the following sections:

 [horizontal]
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
@@ -1,12 +1,11 @@
 [[spring-boot-reference-documentation]]
 = Spring Boot Reference Documentation
 include::authors.adoc[]
+v{spring-boot-version}
 include::attributes.adoc[]



-*{spring-boot-version}*
-
 include::legal.adoc[leveloffset=+1]

 include::documentation.adoc[leveloffset=+1]