aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRobert Glaser <mail@robert-glaser.de>2011-10-18 15:29:16 +0200
committerRobert Glaser <mail@robert-glaser.de>2011-10-18 15:29:16 +0200
commit8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0 (patch)
treec1148706f6e04637891c1425a55792eb7a7e8541 /railties/lib
parent5e1b912f3b3a81cec99a3743b3a9d21e5c96d97c (diff)
downloadrails-8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0.tar.gz
rails-8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0.tar.bz2
rails-8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0.zip
Fixed DataMapper namings in symbols and constants.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/engine/configuration.rb2
-rw-r--r--railties/lib/rails/generators/active_model.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index f424492bb4..99e0201e31 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -21,7 +21,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
diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb
index 4b828340d2..7af893e1fd 100644
--- a/railties/lib/rails/generators/active_model.rb
+++ b/railties/lib/rails/generators/active_model.rb
@@ -11,7 +11,7 @@ module Rails
# ActiveRecord::Generators::ActiveModel.find(Foo, "params[:id]")
# # => "Foo.find(params[:id])"
#
- # Datamapper::Generators::ActiveModel.find(Foo, "params[:id]")
+ # DataMapper::Generators::ActiveModel.find(Foo, "params[:id]")
# # => "Foo.get(params[:id])"
#
# On initialization, the ActiveModel accepts the instance name that will