Merge branch '2.3.x'

rlovtangen · Feb 12, 2014 · 2100e42 · 2100e42
2 parents 5f12336 + 7719a74
commit 2100e42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/en/guide/introduction/whatsNew22.gdoc b/src/en/guide/introduction/whatsNew22.gdoc
@@ -35,7 +35,7 @@ static mappings = {
 
 See the [namespaced controllers|guide:namespacedControllers] docs for more information.
 
-Controller methods and GSP Tags which accept a controller name as a paramater now support an optional parameter indicating 
+Controller methods and GSP Tags which accept a controller name as a parameter now support an optional parameter indicating
 that the controller is provided by a specific plugin.
 
 {code:java}

diff --git a/src/en/guide/upgradingFromPreviousVersionsOfGrails.gdoc b/src/en/guide/upgradingFromPreviousVersionsOfGrails.gdoc
@@ -1,4 +1,4 @@
-A number of changes need to considered when upgrading your application from Grails 2.2, some of them breaking. Here's a quick list with more detail on each item following after:
+A number of changes need to be considered when upgrading your application from Grails 2.2, some of them breaking. Here's a quick list with more detail on each item following after:
 
 * New improved data binding (no Spring property editors)
 * Much improved XSS prevention with default HTML encoding