From ac15647bf0e6ed85714dee4e2b14b2e7e6f29320 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Thu, 3 Feb 2011 23:51:06 -0500
Subject: [PATCH] keep options titles consistent to "Options"

---
 actionpack/lib/action_dispatch/routing/mapper.rb       | 10 +++++-----
 activerecord/lib/active_record/associations.rb         |  2 +-
 .../lib/active_record/relation/finder_methods.rb       |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index b28b68ad83..b5ff6e0dcb 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -273,7 +273,7 @@ module ActionDispatch
         #   match 'photos/:id', :to => 'photos#show'
         #   match 'photos/:id', :controller => 'photos', :action => 'show'
         #
-        # === Supported options
+        # === Options
         #
         # [:controller]
         #   The route's controller.
@@ -549,7 +549,7 @@ module ActionDispatch
         # The difference here being that the routes generated are like /rails/projects/2,
         # rather than /accounts/rails/projects/2.
         #
-        # === Supported options
+        # === Options
         #
         # Takes same options as <tt>Base#match</tt> and <tt>Resources#resources</tt>.
         #
@@ -632,7 +632,7 @@ module ActionDispatch
         #        admin_post PUT    /admin/posts/:id(.:format)      {:action=>"update", :controller=>"admin/posts"}
         #        admin_post DELETE /admin/posts/:id(.:format)      {:action=>"destroy", :controller=>"admin/posts"}
         #
-        # === Supported options
+        # === Options
         #
         # The +:path+, +:as+, +:module+, +:shallow_path+ and +:shallow_prefix+
         # options all default to the name of the namespace.
@@ -950,7 +950,7 @@ module ActionDispatch
         #   PUT     /geocoder
         #   DELETE  /geocoder
         #
-        # === Supported options
+        # === Options
         # Takes same options as +resources+.
         def resource(*resources, &block)
           options = resources.extract_options!
@@ -1013,7 +1013,7 @@ module ActionDispatch
         #   PUT     /photos/:id/comments/:id
         #   DELETE  /photos/:id/comments/:id
         #
-        # === Supported options
+        # === Options
         # Takes same options as <tt>Base#match</tt> as well as:
         #
         # [:path_names]
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.