aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-19 08:19:39 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-19 08:19:39 -0700
commit6df96c90ab3623915514e29bf796aeb49e3fa08e (patch)
treeddfaca33cfbd599868790001875fa07a5c18fb2e /railties/lib/rails/engine
parent26bdcf7299a44b45242e2e4be209b325cfe6bfb4 (diff)
parent8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0 (diff)
downloadrails-6df96c90ab3623915514e29bf796aeb49e3fa08e.tar.gz
rails-6df96c90ab3623915514e29bf796aeb49e3fa08e.tar.bz2
rails-6df96c90ab3623915514e29bf796aeb49e3fa08e.zip
Merge pull request #3359 from mrreynolds/datamapper_naming_fix
Fixed DataMapper namings in symbols and constants.
Diffstat (limited to 'railties/lib/rails/engine')
-rw-r--r--railties/lib/rails/engine/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index d3b42021fc..e31df807a6 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -20,7 +20,7 @@ module Rails
# Holds generators configuration:
#
# config.generators do |g|
- # g.orm :datamapper, :migration => true
+ # g.orm :data_mapper, :migration => true
# g.template_engine :haml
# g.test_framework :rspec
# end