diff options
Diffstat (limited to 'activerecord/lib')
5 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index c227893765..6fef668e1a 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -123,7 +123,7 @@ module ActiveRecord # This defaults to +false+. # # An optional block can be passed to convert the argument that is passed to the writer method into an instance of - # <tt>:class_name</tt>. The block will only be called if the arguement is not already an instance of <tt>:class_name</tt>. + # <tt>:class_name</tt>. The block will only be called if the argument is not already an instance of <tt>:class_name</tt>. # # Option examples: # composed_of :temperature, :mapping => %w(reading celsius) diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index e9a1eb67b9..16cc4773cd 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -266,7 +266,7 @@ module ActiveRecord # # === Association callbacks # - # Similiar to the normal callbacks that hook into the lifecycle of an Active Record object, you can also define callbacks that get + # Similar to the normal callbacks that hook into the lifecycle of an Active Record object, you can also define callbacks that get # triggered when you add an object to or remove an object from an association collection. Example: # # class Project diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 2d06e90416..06b1276860 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -120,7 +120,7 @@ module ActiveRecord def count(*args) column_name, options = @reflection.klass.send(:construct_count_options_from_args, *args) if @reflection.options[:uniq] - # This is needed becase 'SELECT count(DISTINCT *)..' is not valid sql statement. + # This is needed because 'SELECT count(DISTINCT *)..' is not valid sql statement. column_name = "#{@reflection.klass.table_name}.#{@reflection.klass.primary_key}" if column_name == :all options.merge!(:distinct => true) end diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 118b596591..dd26c1f749 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -79,7 +79,7 @@ module ActiveRecord end end - # Check to see if the method is defined in the model or any of it's subclasses that also derive from ActiveRecord. + # Check to see if the method is defined in the model or any of its subclasses that also derive from ActiveRecord. # Raise DangerousAttributeError if the method is defined by ActiveRecord though. def instance_method_already_implemented?(method_name) return true if method_name =~ /^id(=$|\?$|$)/ diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index c8807f6f64..9a9bf28323 100755 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -164,7 +164,7 @@ module ActiveRecord # If <tt>Base#save!</tt> is called it will raise a +RecordNotSaved+ exception. # Nothing will be appended to the errors object. # - # == Cancelling callbacks + # == Canceling callbacks # # If a <tt>before_*</tt> callback returns +false+, all the later callbacks and the associated action are cancelled. If an <tt>after_*</tt> callback returns # +false+, all the later callbacks are cancelled. Callbacks are generally run in the order they are defined, with the exception of callbacks |