aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAkshay Vishnoi <akshay.vishnoi@vinsol.com>2014-04-20 21:03:09 +0530
committerAkshay Vishnoi <akshay.vishnoi@vinsol.com>2014-04-20 21:03:09 +0530
commit0c2854fa0302acfeb27f1316f2163b3c1dfc4f95 (patch)
tree5d7773b18d731e3fb95fc9d5b8e42dbe9e0180ba /activesupport
parentb1000ead4232ed0b019796b836003596300946f1 (diff)
downloadrails-0c2854fa0302acfeb27f1316f2163b3c1dfc4f95.tar.gz
rails-0c2854fa0302acfeb27f1316f2163b3c1dfc4f95.tar.bz2
rails-0c2854fa0302acfeb27f1316f2163b3c1dfc4f95.zip
[ci skip] builtin -> built-in
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/time/conversions.rb2
-rw-r--r--activesupport/lib/active_support/inflector/methods.rb4
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.