aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-05 00:24:58 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-05 00:24:58 -0700
commit65fd004da4add3e9b5cdc65a41d74d7ba442eac3 (patch)
tree0e1b4c5af32cff8a5840fca06ef398d6b2797b68
parente99c1e3a3bd231a11cb2e2d5062dd1cdbcda61e2 (diff)
parenta9fb5116d7f9016e870343320c8e2b3a3cbd4064 (diff)
downloadrails-65fd004da4add3e9b5cdc65a41d74d7ba442eac3.tar.gz
rails-65fd004da4add3e9b5cdc65a41d74d7ba442eac3.tar.bz2
rails-65fd004da4add3e9b5cdc65a41d74d7ba442eac3.zip
Merge pull request #391 from bradleypriest/patch-1
Tidying up the language in wrap_parameters.rb
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index 60137ed2bb..32ffbee7a1 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -3,7 +3,7 @@
# This file contains the settings for ActionController::ParametersWrapper
# which will be enabled by default in the upcoming version of Ruby on Rails.
-# Enable parameter wrapping for JSON. You can disable this by set :format to empty array.
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActionController::Base.wrap_parameters :format => [:json]
# Disable root element in JSON by default.