diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-02-05 19:47:08 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-02-05 19:47:08 +0100 |
| commit | 8b5dc9caa52a2877e3ecc207515fd156abad45e0 (patch) | |
| tree | 1ce25206b88a7fb45ef6e37d1a7c293c31477c02 /activerecord/lib/active_record/relation | |
| parent | 59f7780a3454a14054d1d33d9b6e31192ab2e58b (diff) | |
| parent | 277327bb7f389a140eb4ae7722d64d6cf45e06cf (diff) | |
| download | rails-8b5dc9caa52a2877e3ecc207515fd156abad45e0.tar.gz rails-8b5dc9caa52a2877e3ecc207515fd156abad45e0.tar.bz2 rails-8b5dc9caa52a2877e3ecc207515fd156abad45e0.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index e447de92a4..7f32e5538e 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -19,7 +19,7 @@ module ActiveRecord # # All approaches accept an options hash as their last parameter. # - # ==== Parameters + # ==== Options # # * <tt>:conditions</tt> - An SQL fragment like "administrator = 1", <tt>["user_name = ?", username]</tt>, # or <tt>["user_name = :user_name", { :user_name => user_name }]</tt>. See conditions in the intro. |