diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index 09fb4f9a1b..29eb2b033a 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -6,10 +6,10 @@ module ActionController module ResponseAssertions # Asserts that the response is one of the following types: # - # * :success: Status code was 200 - # * :redirect: Status code was in the 300-399 range - # * :missing: Status code was 404 - # * :error: Status code was in the 500-599 range + # * :success - Status code was 200 + # * :redirect - Status code was in the 300-399 range + # * :missing - Status code was 404 + # * :error - Status code was in the 500-599 range # # You can also pass an explicit status number like assert_response(501) # or its symbolic equivalent assert_response(:not_implemented). diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index 9103670742..f70186fe17 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -326,14 +326,16 @@ module ActionController # that update or insert an element with that identifier. # # Use the first argument to narrow down assertions to only statements - # of that type. Possible values are +:replace+, +:replace_html+, +:show+, - # +:hide+, +:toggle+, +:remove+ and +:insert_html+. + # of that type. Possible values are :replace, :replace_html, + # :show, :hide, :toggle, :remove and + # :insert_html. # - # Use the argument +:insert+ followed by an insertion position to narrow + # Use the argument :insert followed by an insertion position to narrow # down the assertion to only statements that insert elements in that - # position. Possible values are +:top+, +:bottom+, +:before+ and +:after+. + # position. Possible values are :top, :bottom, :before + # and :after. # - # Using the +:remove+ statement, you will be able to pass a block, but it will + # Using the :remove statement, you will be able to pass a block, but it will # be ignored as there is no HTML passed for this statement. # # === Using blocks diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 662aa09bb6..07fed278e2 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -982,11 +982,11 @@ module ActionController #:nodoc: # Redirects the browser to the target specified in +options+. This parameter can take one of three forms: # - # * Hash: The URL will be generated by calling url_for with the +options+. - # * Record: The URL will be generated by calling url_for with the +options+, which will reference a named URL for that record. - # * String starting with protocol:// (like http://): Is passed straight through as the target for redirection. - # * String not containing a protocol: The current protocol and host is prepended to the string. - # * :back: Back to the page that issued the request. Useful for forms that are triggered from multiple places. + # * Hash - The URL will be generated by calling url_for with the +options+. + # * Record - The URL will be generated by calling url_for with the +options+, which will reference a named URL for that record. + # * String starting with protocol:// (like http://) - Is passed straight through as the target for redirection. + # * String not containing a protocol - The current protocol and host is prepended to the string. + # * :back - Back to the page that issued the request. Useful for forms that are triggered from multiple places. # Short-hand for redirect_to(request.env["HTTP_REFERER"]) # # Examples: diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb index 43927408a9..8550f24526 100644 --- a/actionpack/lib/action_controller/verification.rb +++ b/actionpack/lib/action_controller/verification.rb @@ -42,32 +42,32 @@ module ActionController #:nodoc: # the user is redirected to a different action. The +options+ parameter # is a hash consisting of the following key/value pairs: # - # * :params: a single key or an array of keys that must + # * :params - a single key or an array of keys that must # be in the params hash in order for the action(s) to be safely # called. - # * :session: a single key or an array of keys that must + # * :session - a single key or an array of keys that must # be in the session in order for the action(s) to be safely called. - # * :flash: a single key or an array of keys that must + # * :flash - a single key or an array of keys that must # be in the flash in order for the action(s) to be safely called. - # * :method: a single key or an array of keys--any one of which + # * :method - a single key or an array of keys--any one of which # must match the current request method in order for the action(s) to # be safely called. (The key should be a symbol: :get or # :post, for example.) - # * :xhr: true/false option to ensure that the request is coming + # * :xhr - true/false option to ensure that the request is coming # from an Ajax call or not. - # * :add_flash: a hash of name/value pairs that should be merged + # * :add_flash - a hash of name/value pairs that should be merged # into the session's flash if the prerequisites cannot be satisfied. - # * :add_headers: a hash of name/value pairs that should be + # * :add_headers - a hash of name/value pairs that should be # merged into the response's headers hash if the prerequisites cannot # be satisfied. - # * :redirect_to: the redirection parameters to be used when + # * :redirect_to - the redirection parameters to be used when # redirecting if the prerequisites cannot be satisfied. You can # redirect either to named route or to the action in some controller. - # * :render: the render parameters to be used when + # * :render - the render parameters to be used when # the prerequisites cannot be satisfied. - # * :only: only apply this verification to the actions specified + # * :only - only apply this verification to the actions specified # in the associated array (may also be a single value). - # * :except: do not apply this verification to the actions + # * :except - do not apply this verification to the actions # specified in the associated array (may also be a single value). def verify(options={}) filter_opts = { :only => options[:only], :except => options[:except] } diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb index 61e51f50af..7b82c38a0e 100644 --- a/actionpack/lib/action_view/helpers/record_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb @@ -38,7 +38,7 @@ module ActionView # ... # # content_tag_for also accepts a hash of options, which will be converted to - # additional HTML attributes. If you specify a +:class+ value, it will be combined + # additional HTML attributes. If you specify a :class value, it will be combined # with the default class name for your object. For example: # # <% content_tag_for(:li, @person, :class => "bar") %>... diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 5ce31197d4..9620ce1b20 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -97,14 +97,14 @@ module ActiveRecord # end # # Options: - # * :conditions: An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. See conditions in the intro. - # * :joins: An SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id". (Rarely needed). + # * :conditions - An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. See conditions in the intro. + # * :joins - An SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id". (Rarely needed). # The records will be returned read-only since they will have attributes that do not correspond to the table's columns. - # * :order: An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations). - # * :group: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause. - # * :select: By default, this is * as in SELECT * FROM, but can be changed if you for example want to do a join, but not + # * :order - An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations). + # * :group - An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause. + # * :select - By default, this is * as in SELECT * FROM, but can be changed if you for example want to do a join, but not # include the joined columns. - # * :distinct: Set this to true to make this a distinct calculation, such as SELECT COUNT(DISTINCT posts.id) ... + # * :distinct - Set this to true to make this a distinct calculation, such as SELECT COUNT(DISTINCT posts.id) ... # # Examples: # Person.calculate(:count, :all) # The same as Person.count diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 7c76146cde..6bd56fd3c8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -300,17 +300,17 @@ module ActiveRecord # :date, :binary, :boolean. # # Available options are (none of these exists by default): - # * :limit: + # * :limit - # Requests a maximum column length (:string, :text, # :binary or :integer columns only) - # * :default: + # * :default - # The column's default value. Use nil for NULL. - # * :null: + # * :null - # Allows or disallows +NULL+ values in the column. This option could # have been named :null_allowed. - # * :precision: + # * :precision - # Specifies the precision for a :decimal column. - # * :scale: + # * :scale - # Specifies the scale for a :decimal column. # # Please be aware of different RDBMS implementations behavior with diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 89a4499369..56c7cf1d71 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -5,8 +5,8 @@ module ActiveSupport #:nodoc: module Array #:nodoc: module Conversions # Converts the array to comma-seperated sentence where the last element is joined by the connector word. Options: - # * :connector: The word used to join the last element in arrays with two or more elements (default: "and") - # * :skip_last_comma: Set to true to return "a, b and c" instead of "a, b, and c". + # * :connector - The word used to join the last element in arrays with two or more elements (default: "and") + # * :skip_last_comma - Set to true to return "a, b and c" instead of "a, b, and c". def to_sentence(options = {}) options.assert_valid_keys(:connector, :skip_last_comma) options.reverse_merge! :connector => 'and', :skip_last_comma => false diff --git a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb index 2e7e9fac3f..66fe47a604 100644 --- a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb +++ b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb @@ -283,8 +283,8 @@ module ActiveSupport::Multibyte::Handlers #:nodoc: # Returns the KC normalization of the string by default. NFKC is considered the best normalization form for # passing strings to databases and validations. # - # * str: The string to perform normalization on. - # * form: The form you want to normalize in. Should be one of the following: :c, :kc, :d or :kd. + # * str - The string to perform normalization on. + # * form - The form you want to normalize in. Should be one of the following: :c, :kc, :d or :kd. def normalize(str, form=ActiveSupport::Multibyte::DEFAULT_NORMALIZATION_FORM) # See http://www.unicode.org/reports/tr15, Table 1 codepoints = u_unpack(str)