aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-29 14:23:33 -0700
committerXavier Noria <fxn@hashref.com>2011-04-29 14:23:33 -0700
commit9971387a3b4ca0c03b9bd32de7dc417c5399fdd7 (patch)
tree6412c8cad8255e4da25a3c9b91046e9de9d568b1 /railties
parentcc35d5c9e7049e62517642daf67d756312c5a5d2 (diff)
parent564fe7f633c07cf6f0d960dfa2cd9e713a58d784 (diff)
downloadrails-9971387a3b4ca0c03b9bd32de7dc417c5399fdd7.tar.gz
rails-9971387a3b4ca0c03b9bd32de7dc417c5399fdd7.tar.bz2
rails-9971387a3b4ca0c03b9bd32de7dc417c5399fdd7.zip
Merged pull request #350 from bcardarella/master.
Fixed documentation, 'asset' -> 'assets'
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 6b2aa97faa..46ccb7e078 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -40,7 +40,7 @@ module <%= app_const_base %>
# config.i18n.default_locale = :de
# Please note that JavaScript expansions are *ignored altogether* if the asset
- # pipeline is enabled (see config.asset.enabled below). Put your defaults in
+ # pipeline is enabled (see config.assets.enabled below). Put your defaults in
# app/assets/javascripts/application.js in that case.
#
# JavaScript files you want as :defaults (application.js is always included).