Merge branch '1.3.x'

pull/5417/head
Stephane Nicoll 9 years ago
commit a5a8c567cf

@ -744,6 +744,7 @@
<doctype>book</doctype> <doctype>book</doctype>
<attributes> <attributes>
<docinfo>true</docinfo> <docinfo>true</docinfo>
<spring-version>${spring.version}</spring-version>
<spring-boot-version>${project.version}</spring-boot-version> <spring-boot-version>${project.version}</spring-boot-version>
<spring-boot-docs-version>${project.version}</spring-boot-docs-version> <spring-boot-docs-version>${project.version}</spring-boot-docs-version>
<spring-boot-repo>${spring-boot-repo}</spring-boot-repo> <spring-boot-repo>${spring-boot-repo}</spring-boot-repo>

@ -37,7 +37,7 @@ diverge from the defaults.
[[getting-started-system-requirements]] [[getting-started-system-requirements]]
== System Requirements == System Requirements
By default, Spring Boot {spring-boot-version} requires http://www.java.com[Java 7] and By default, Spring Boot {spring-boot-version} requires http://www.java.com[Java 7] and
Spring Framework 4.1.5 or above. You can use Spring Boot with Java 6 with some additional Spring Framework {spring-version} or above. You can use Spring Boot with Java 6 with some additional
configuration. See <<howto.adoc#howto-use-java-6>> for more details. Explicit build support configuration. See <<howto.adoc#howto-use-java-6>> for more details. Explicit build support
is provided for Maven (3.2+) and Gradle (1.12+). is provided for Maven (3.2+) and Gradle (1.12+).

Loading…
Cancel
Save