diff options
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb | 4 |
2 files changed, 4 insertions, 4 deletions
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: - # * <tt>:connector</tt>: The word used to join the last element in arrays with two or more elements (default: "and") - # * <tt>:skip_last_comma</tt>: Set to true to return "a, b and c" instead of "a, b, and c". + # * <tt>:connector</tt> - The word used to join the last element in arrays with two or more elements (default: "and") + # * <tt>:skip_last_comma</tt> - 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. # - # * <tt>str</tt>: The string to perform normalization on. - # * <tt>form</tt>: The form you want to normalize in. Should be one of the following: :c, :kc, :d or :kd. + # * <tt>str</tt> - The string to perform normalization on. + # * <tt>form</tt> - 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) |