Merge branch 'master' of github.com:grails/grails-doc

Conflicts: build.gradle
grails · Jun 26, 2014 · 59409d0 · 59409d0
2 parents 86d5f66 + 771bd2b
commit 59409d0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: "base"
 
-version = System.getProperty("grails.version") ?: "2.4.1"
+version = System.getProperty("grails.version") ?: "2.4.2"
 
 archivesBaseName = "grails-docs"
 
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.grails:grails-docs:2.4.1"
+        classpath "org.grails:grails-docs:2.4.2"
         classpath 'org.codehaus.groovy:groovy-all:2.3.0'
     }
 }

diff --git a/src/en/guide/gettingStarted/supportedJavaEEContainers.gdoc b/src/en/guide/gettingStarted/supportedJavaEEContainers.gdoc
@@ -24,8 +24,4 @@ Grails runs on any container that supports Servlet 2.5 and above and is known to
 It's required to set "-Xverify:none" in "Application servers > server > Process Definition > Java Virtual Machine > Generic JVM arguments" for older versions of WebSphere. This is no longer needed for WebSphere version 8 or newer.
 {note}
 
-{note}
-Grails 2.4 and later require Servlet 3.0 and above.
-{note}
-
 Some containers have bugs however, which in most cases can be worked around. A [list of known deployment issues|http://grails.org/Deployment] can be found on the Grails wiki.
diff --git a/src/en/guide/introduction/whatsNew24.gdoc b/src/en/guide/introduction/whatsNew24.gdoc
@@ -12,10 +12,6 @@ h4. Hibernate 4.3
 
 Grails 2.4 now uses Hibernate 4.3.5 by default (Hibernate 3 is still available as an optional install).
 
-h4. Servlet API 3.0 minimum
-
-Grails 2.4 requires container compatible with Servlet 3.0 and above.
-
 h4. Standalone GORM and GSP
 
 GORM and GSP can now be used outside of Grails. See the following guides / examples for more information: