aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorGabriel Horner <gabriel.horner@gmail.com>2011-02-03 23:51:06 -0500
committerGabriel Horner <gabriel.horner@gmail.com>2011-02-03 23:51:06 -0500
commitac15647bf0e6ed85714dee4e2b14b2e7e6f29320 (patch)
tree9ebbc5d43dd4945106203a40434677bab04bafda /activerecord
parenta96a9a494856c57bb8773d8d22bbee176cda9d6e (diff)
downloadrails-ac15647bf0e6ed85714dee4e2b14b2e7e6f29320.tar.gz
rails-ac15647bf0e6ed85714dee4e2b14b2e7e6f29320.tar.bz2
rails-ac15647bf0e6ed85714dee4e2b14b2e7e6f29320.zip
keep options titles consistent to "Options"
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations.rb2
-rw-r--r--activerecord/lib/active_record/relation/finder_methods.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 891ac52f8a..285ce32e21 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -912,7 +912,7 @@ module ActiveRecord
# * <tt>Firm#clients.create</tt> (similar to <tt>c = Client.new("firm_id" => id); c.save; c</tt>)
# The declaration can also include an options hash to specialize the behavior of the association.
#
- # === Supported options
+ # === Options
# [:class_name]
# Specify the class name of the association. Use it only if that name can't be inferred
# from the association name. So <tt>has_many :products</tt> will by default be linked
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.