aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-12-19 14:27:43 +0000
committerPratik Naik <pratiknaik@gmail.com>2008-12-19 14:27:43 +0000
commitc3f53f412cd170fc295b46e48aa81837ad15ec83 (patch)
tree79de6effe9874f3d17eada3666c13b5f76fa537c /activerecord/lib/active_record/base.rb
parent89b75814045e811d52b19278ae27b5f45c6d9dd6 (diff)
downloadrails-c3f53f412cd170fc295b46e48aa81837ad15ec83.tar.gz
rails-c3f53f412cd170fc295b46e48aa81837ad15ec83.tar.bz2
rails-c3f53f412cd170fc295b46e48aa81837ad15ec83.zip
Merge docrails
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-xactiverecord/lib/active_record/base.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index dfead0b94f..aa6013583d 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -811,8 +811,7 @@ module ActiveRecord #:nodoc:
#
# ==== Parameters
#
- # * +updates+ - A string of column and value pairs that will be set on any records that match conditions.
- # What goes into the SET clause.
+ # * +updates+ - A string of column and value pairs that will be set on any records that match conditions. This creates the SET clause of the generated SQL.
# * +conditions+ - An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. See conditions in the intro for more info.
# * +options+ - Additional options are <tt>:limit</tt> and <tt>:order</tt>, see the examples for usage.
#