mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
keep options titles consistent to "Options"
This commit is contained in:
@@ -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]
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user