diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/callbacks.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 54fa7ac60c..0147c8fd4d 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Change plings to the more conventional quotes in the documentation. Closes #10104 [danger] + * Fix HasManyThrough Association so it uses :conditions on the HasMany Association. Closes #9729 [danger] * Ensure that column names are quoted. Closes #10134 [wesley.moxam] diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index 8d619e3fb3..c8807f6f64 100755 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -143,7 +143,7 @@ module ActiveRecord # before_destroy 'self.class.delete_all "parent_id = #{id}"' # end # - # Notice that single plings (') are used so the <tt>#{id}</tt> part isn't evaluated until the callback is triggered. Also note that these + # Notice that single quotes (') are used so the <tt>#{id}</tt> part isn't evaluated until the callback is triggered. Also note that these # inline callbacks can be stacked just like the regular ones: # # class Topic < ActiveRecord::Base |