aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-07-06 10:10:05 -0400
committerNeeraj Singh <neerajdotname@gmail.com>2010-07-06 10:10:05 -0400
commitffdbe56d996a2992de44c6823263f8fea19c2d61 (patch)
tree41c177a02308c4c9c6313017c5c49f5754766de8 /railties/lib
parentc1fc59c7ac1726f54d54b2896004997892e15ec9 (diff)
parente5c95b1871da61984b4cd109e39b605c447323dd (diff)
downloadrails-ffdbe56d996a2992de44c6823263f8fea19c2d61.tar.gz
rails-ffdbe56d996a2992de44c6823263f8fea19c2d61.tar.bz2
rails-ffdbe56d996a2992de44c6823263f8fea19c2d61.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 199afbdc30..a27d38e23a 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -267,7 +267,7 @@ module Rails
ActiveSupport::Deprecation.warn "freeze! is deprecated since your rails app now comes bundled with Rails by default, please check your Gemfile"
end
- # Make an entry in Rails routing file conifg/routes.rb
+ # Make an entry in Rails routing file config/routes.rb
#
# === Example
#