diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2014-04-20 12:46:03 -0500 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2014-04-20 12:46:03 -0500 |
| commit | 86b02826a6d301fe19c30a6f5c01a9e084279c03 (patch) | |
| tree | c9f4bb4f6f5670074c8f93530711905619b77922 /activesupport/lib | |
| parent | 0044bfb1884d311014ba30fe2a96925a3d7c0cc6 (diff) | |
| parent | 0c2854fa0302acfeb27f1316f2163b3c1dfc4f95 (diff) | |
| download | rails-86b02826a6d301fe19c30a6f5c01a9e084279c03.tar.gz rails-86b02826a6d301fe19c30a6f5c01a9e084279c03.tar.bz2 rails-86b02826a6d301fe19c30a6f5c01a9e084279c03.zip | |
Merge pull request #14820 from akshay-vishnoi/doc_changes
[ci skip] builtin -> built-in
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/inflector/methods.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 9fd26156c7..dbf1f2f373 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -20,7 +20,7 @@ class Time :iso8601 => lambda { |time| time.iso8601 } } - # Converts to a formatted string. See DATE_FORMATS for builtin formats. + # Converts to a formatted string. See DATE_FORMATS for built-in formats. # # This method is aliased to <tt>to_s</tt>. # diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb index 6229d15619..94bda511bc 100644 --- a/activesupport/lib/active_support/inflector/methods.rb +++ b/activesupport/lib/active_support/inflector/methods.rb @@ -173,7 +173,7 @@ module ActiveSupport # 'ActiveRecord::CoreExtensions::String::Inflections'.demodulize # => "Inflections" # 'Inflections'.demodulize # => "Inflections" # '::Inflections'.demodulize # => "Inflections" - # ''.demodulize # => '' + # ''.demodulize # => "" # # See also +deconstantize+. def demodulize(path) @@ -230,7 +230,7 @@ module ActiveSupport def constantize(camel_cased_word) names = camel_cased_word.split('::') - # Trigger a builtin NameError exception including the ill-formed constant in the message. + # Trigger a built-in NameError exception including the ill-formed constant in the message. Object.const_get(camel_cased_word) if names.empty? # Remove the first blank element in case of '::ClassName' notation. |