From 4e1c2596457415490d0fd587b7a491a4e21e16d2 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 28 Nov 2014 14:03:31 +0100
Subject: [PATCH] Add requirements documentation section

Fixes gh-1439
---
 .../main/asciidoc/documentation-overview.adoc |  8 ++++
 .../src/main/asciidoc/getting-started.adoc    | 40 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc b/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc
index 23751daa5b..0ce8fbc4fb 100644
--- a/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc
+++ b/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc
@@ -40,6 +40,8 @@ Having trouble with Spring Boot, We'd like to help!
 NOTE: All of Spring Boot is open source, including the documentation! If you find problems
 with the docs; or if you just want to improve them, please {github-code}[get involved].
 
+
+
 [[boot-documentation-first-steps]]
 == First steps
 If you're just getting started with Spring Boot, or 'Spring' in general,
@@ -47,6 +49,7 @@ If you're just getting started with Spring Boot, or 'Spring' in general,
 
 * *From scratch:*
   <<getting-started.adoc#getting-started-introducing-spring-boot, Overview>> |
+  <<getting-started.adoc#getting-started-system-requirements, Requirements>> |
   <<getting-started.adoc#getting-started-installing-spring-boot, Installation>>
 * *Tutorial:*
   <<getting-started.adoc#getting-started-first-application, Part 1>> |
@@ -81,6 +84,8 @@ got you covered>>.
 * *Spring Boot CLI:*
 <<using-spring-boot-cli.adoc#cli, Using the CLI>>
 
+
+
 == Learning about Spring Boot features
 Need more details about Spring Boot's core features?
 <<spring-boot-features.adoc#boot-features, This is for you>>!
@@ -108,6 +113,7 @@ Need more details about Spring Boot's core features?
   <<spring-boot-features.adoc#boot-features-condition-annotations, @Conditions>>
 
 
+
 == Moving to production
 When you're ready to push your Spring Boot application to production, we've got
 <<production-ready-features.adoc#production-ready, some tricks that you might like>>!
@@ -125,6 +131,8 @@ When you're ready to push your Spring Boot application to production, we've got
 <<production-ready-features.adoc#production-ready-tracing, Tracing>> |
 <<production-ready-features.adoc#production-ready-process-monitoring, Process>>
 
+
+
 == Advanced topics
 Lastly, we have a few topics for the more advanced user.
 
diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index c25df9a324..9c8b29c70d 100644
--- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -34,6 +34,46 @@ diverge from the defaults.
 
 
 
+[[getting-started-system-requirements]]
+== System Requirements
+Spring Boot {spring-boot-version} requires http://www.java.com[Java 6] and Spring
+Framework 4.2.3 or above. Explicit build support is provided for Maven (3.2+) and
+Gradle (1.12+).
+
+TIP: Although you can use Spring Boot with Java 6, we generally recommend Java 8 if at
+all possible.
+
+=== Servlet containers
+The following embedded servlet containers are supported out of the box:
+
+|===
+|Name |Servlet Version |Java Version
+
+|Tomcat 8
+|3.1
+|Java 7+
+
+|Tomcat 7
+|3.0
+|Java 6+
+
+|Jetty 9
+|3.1
+|Java 7+
+
+|Jetty 8
+|3.0
+|Java 6+
+
+|Undertow 1.1
+|3.1
+|Java 7+
+|===
+
+You can also deploy Spring Boot applications to any Servlet 3.0+ compatible container.
+
+
+
 [[getting-started-installing-spring-boot]]
 == Installing Spring Boot
 Spring Boot can be used with "`classic`" Java development tools or installed as a command