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

Merge branch '2.4.x' 

Closes gh-24496
This commit is contained in:
Stephane Nicoll 2020-12-14 16:20:11 +01:00
parent 85d0f95f7a 96510156ae
commit f9e44cd774
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-docs/build.gradle
View File

@ -144,7 +144,6 @@ task aggregatedJavadoc(type: Javadoc) {
"https://docs.spring.io/spring-framework/docs/${versionConstraints["org.springframework:spring-core"]}/javadoc-api/", "https://docs.spring.io/spring-framework/docs/${versionConstraints["org.springframework:spring-core"]}/javadoc-api/",
"https://docs.spring.io/spring-security/site/docs/${versionConstraints["org.springframework.security:spring-security-core"]}/api/", "https://docs.spring.io/spring-security/site/docs/${versionConstraints["org.springframework.security:spring-security-core"]}/api/",
"https://tomcat.apache.org/tomcat-${tomcatDocsVersion}-doc/api/", "https://tomcat.apache.org/tomcat-${tomcatDocsVersion}-doc/api/",
"https://www.eclipse.org/jetty/javadoc/${versionConstraints["org.eclipse.jetty:jetty-server"]}/",
"https://www.thymeleaf.org/apidocs/thymeleaf/${versionConstraints["org.thymeleaf:thymeleaf"]}/" "https://www.thymeleaf.org/apidocs/thymeleaf/${versionConstraints["org.thymeleaf:thymeleaf"]}/"
] as String[] ] as String[]
} }

1
spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
View File

@ -104,7 +104,6 @@
:gradle-docs: https://docs.gradle.org/current/userguide :gradle-docs: https://docs.gradle.org/current/userguide
:hibernate-docs: https://docs.jboss.org/hibernate/orm/5.4/userguide/html_single/Hibernate_User_Guide.html :hibernate-docs: https://docs.jboss.org/hibernate/orm/5.4/userguide/html_single/Hibernate_User_Guide.html
:java-api: https://docs.oracle.com/javase/8/docs/api :java-api: https://docs.oracle.com/javase/8/docs/api
:jetty-docs: https://www.eclipse.org/jetty/documentation/{jetty-version}
:jooq-docs: https://www.jooq.org/doc/{jooq-version}/manual-single-page :jooq-docs: https://www.jooq.org/doc/{jooq-version}/manual-single-page
:junit5-docs: https://junit.org/junit5/docs/current/user-guide :junit5-docs: https://junit.org/junit5/docs/current/user-guide
:kotlin-docs: https://kotlinlang.org/docs/reference/ :kotlin-docs: https://kotlinlang.org/docs/reference/

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

@ -864,7 +864,7 @@ Finally, access logging for Jetty can also be configured as follows:
---- ----
By default, logs are redirected to `System.err`. By default, logs are redirected to `System.err`.
For more details, see {jetty-docs}/configuring-jetty-request-logs.html[the Jetty documentation]. For more details, see the Jetty documentation.