documentation project patches, closes #7342, #7319, #7316, #7190 [jeremymcanally]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6470 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 3 insertions, 1 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 15ae80f1cf..4f09dd45a3 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -205,7 +205,9 @@ module Rails
       silence_warnings do
         config = configuration
         constants = self.class.constants
+        
         eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
+        
         (self.class.constants - constants).each do |const|
           Object.const_set(const, self.class.const_get(const))
         end
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index df622f7eee..855f9119d5 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -173,7 +173,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
         sandbox.model_instance = model_instance
         sandbox.instance_variable_set("@#{singular_name}", sandbox.model_instance)
       rescue ActiveRecord::StatementInvalid => e
-        logger.error "Before updating scaffolding from new DB schema, try creating a table for your model (#{class_name})"
+        logger.error "Before updating scaffolding from new DB schema, try creating a table for your model (#{class_name}) named #{class_name.tableize}."
         raise SystemExit
       end
       sandbox.suffix = suffix