root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-24854
This commit is contained in:
Stephane Nicoll 2021-01-15 16:51:10 +01:00
parent e8ae18ae11 b3ab77a5c3
commit 7ec7569939
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.adoc
View File

@ -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:

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/index.singleadoc
View File

@ -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]

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc
View File

@ -1,8 +1,6 @@
[legal]
= Legal
{spring-boot-version}
Copyright © 2012-2021
Copies of this document may be made for your own use and for distribution to