keep options titles consistent to "Options"

This commit is contained in:
Gabriel Horner
2011-02-03 23:51:06 -05:00
parent a96a9a4948
commit ac15647bf0
3 changed files with 7 additions and 7 deletions

View File

@@ -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]

View File

@@ -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

View File

@@ -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.