diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-03-14 22:09:52 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-03-14 22:09:52 +0100 |
| commit | 21b12d89a671131f610dc5600b23cb56839e652b (patch) | |
| tree | e4a317f5fa5336220668d5058d0138c492be9061 /activerecord/lib/active_record/locking/optimistic.rb | |
| parent | dfa9e2811320d44ff140f115a4f7a3abb41bda16 (diff) | |
| parent | a0826cceea8d181cc28046929c9025147f9325af (diff) | |
| download | rails-21b12d89a671131f610dc5600b23cb56839e652b.tar.gz rails-21b12d89a671131f610dc5600b23cb56839e652b.tar.bz2 rails-21b12d89a671131f610dc5600b23cb56839e652b.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 6b2b1ebafe..9a31675782 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -23,7 +23,7 @@ module ActiveRecord # p2.first_name = "should fail" # p2.save # Raises a ActiveRecord::StaleObjectError # - # Optimistic locking will also check for stale data when objects are destroyed. Example: + # Optimistic locking will also check for stale data when objects are destroyed. Example: # # p1 = Person.find(1) # p2 = Person.find(1) |