Merge branch '2.3.x' into 2.4.x

Closes gh-24854
5 years ago · 7ec7569939
3 changed files with 5 additions and 2 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
@ -2,6 +2,9 @@
 = Spring Boot Reference Documentation
 include::authors.adoc[]
 :docinfo: shared
 include::attributes.adoc[]
 *{spring-boot-version}*
 The reference documentation consists of the following sections:
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
@ -4,6 +4,8 @@ include::authors.adoc[]
 :docinfo: shared
 include::attributes.adoc[]
 *{spring-boot-version}*
 include::legal.adoc[leveloffset=+1]
 include::documentation-overview.adoc[leveloffset=+1]
 include::getting-started.adoc[leveloffset=+1]
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc
@ -1,8 +1,6 @@
 [legal]
 = Legal
 {spring-boot-version}
 Copyright &#169; 2012-2021
 Copies of this document may be made for your own use and for distribution to