Cleanup deprecation notices.

3 files changed, 8 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller/deprecated/dispatcher.rb b/actionpack/lib/action_controller/deprecated/dispatcher.rb
index 1a70d2ee4d..8c21e375dd 100644
--- a/actionpack/lib/action_controller/deprecated/dispatcher.rb
+++ b/actionpack/lib/action_controller/deprecated/dispatcher.rb
@@ -15,7 +15,7 @@ module ActionController
 
       def to_prepare(*args, &block)
         ActiveSupport::Deprecation.warn "ActionController::Dispatcher.to_prepare is deprecated. " <<
-          "Please use ActionDispatch::Callbacks.to_prepare instead.", caller
+          "Please use config.to_prepare instead", caller
         ActionDispatch::Callbacks.after(*args, &block)
       end
 
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index 2d88f49f5f..92030e5bfd 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -9,7 +9,7 @@ module ActiveRecord
     module ClassMethods
       # Returns a relation if invoked without any arguments.
       #
-      #   posts = Post.scoped 
+      #   posts = Post.scoped
       #   posts.size # Fires "select count(*) from  posts" and returns the count
       #   posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
       #
@@ -41,8 +41,8 @@ module ActiveRecord
       #     scope :red, :conditions => {:color => 'red'}
       #     scope :dry_clean_only, :joins => :washing_instructions, :conditions => ['washing_instructions.dry_clean_only = ?', true]
       #   end
-      # 
-      # The above calls to <tt>scope</tt> define class methods Shirt.red and Shirt.dry_clean_only. Shirt.red, 
+      #
+      # The above calls to <tt>scope</tt> define class methods Shirt.red and Shirt.dry_clean_only. Shirt.red,
       # in effect, represents the query <tt>Shirt.find(:all, :conditions => {:color => 'red'})</tt>.
       #
       # Unlike <tt>Shirt.find(...)</tt>, however, the object returned by Shirt.red is not an Array; it resembles the association object
@@ -120,7 +120,7 @@ module ActiveRecord
       end
 
       def named_scope(*args, &block)
-        ActiveSupport::Deprecation.warn("Base.named_scope has been deprecated, please use Base.scope instead.", caller)
+        ActiveSupport::Deprecation.warn("Base.named_scope has been deprecated, please use Base.scope instead", caller)
         scope(*args, &block)
       end
     end
diff --git a/railties/lib/rails/deprecation.rb b/railties/lib/rails/deprecation.rb
index 43f08d13df..f28da5a6b0 100644
--- a/railties/lib/rails/deprecation.rb
+++ b/railties/lib/rails/deprecation.rb
@@ -11,7 +11,7 @@ RAILS_ROOT = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
   end
 
   def warn(callstack, called, args)
-    msg = "RAILS_ROOT is deprecated! Use Rails.root instead."
+    msg = "RAILS_ROOT is deprecated! Use Rails.root instead"
     ActiveSupport::Deprecation.warn(msg, callstack)
   end
 end).new
@@ -26,7 +26,7 @@ RAILS_ENV = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
   end
 
   def warn(callstack, called, args)
-    msg = "RAILS_ENV is deprecated! Use Rails.env instead."
+    msg = "RAILS_ENV is deprecated! Use Rails.env instead"
     ActiveSupport::Deprecation.warn(msg, callstack)
   end
 end).new
@@ -41,7 +41,7 @@ RAILS_DEFAULT_LOGGER = (Class.new(ActiveSupport::Deprecation::DeprecationProxy)
   end
 
   def warn(callstack, called, args)
-    msg = "RAILS_DEFAULT_LOGGER is deprecated! Use Rails.logger instead."
+    msg = "RAILS_DEFAULT_LOGGER is deprecated! Use Rails.logger instead"
     ActiveSupport::Deprecation.warn(msg, callstack)
   end
 end).new