Merge branch 'master' of https://github.com/rails/rails

1 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb
index e9ac5516ec..ea1709cb1f 100644
--- a/activerecord/lib/active_record/errors.rb
+++ b/activerecord/lib/active_record/errors.rb
@@ -30,7 +30,7 @@ module ActiveRecord
   class SerializationTypeMismatch < ActiveRecordError
   end
 
-  # Raised when adapter not specified on connection (or configuration file <tt>config/database.yml</tt> 
+  # Raised when adapter not specified on connection (or configuration file <tt>config/database.yml</tt>
   # misses adapter field).
   class AdapterNotSpecified < ActiveRecordError
   end
@@ -39,7 +39,7 @@ module ActiveRecord
   class AdapterNotFound < ActiveRecordError
   end
 
-  # Raised when connection to the database could not been established (for example when <tt>connection=</tt> 
+  # Raised when connection to the database could not been established (for example when <tt>connection=</tt>
   # is given a nil object).
   class ConnectionNotEstablished < ActiveRecordError
   end
@@ -53,7 +53,7 @@ module ActiveRecord
   class RecordNotSaved < ActiveRecordError
   end
 
-  # Raised when SQL statement cannot be executed by the database (for example, it's often the case for 
+  # Raised when SQL statement cannot be executed by the database (for example, it's often the case for
   # MySQL when Ruby driver used is too old).
   class StatementInvalid < ActiveRecordError
   end
@@ -81,7 +81,7 @@ module ActiveRecord
   class InvalidForeignKey < WrappedDatabaseException
   end
 
-  # Raised when number of bind variables in statement given to <tt>:condition</tt> key (for example, 
+  # Raised when number of bind variables in statement given to <tt>:condition</tt> key (for example,
   # when using +find+ method)
   # does not match number of expected variables.
   #