aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-17 10:17:42 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-17 10:17:42 -0800
commit6ff506ffbc438a92cb6d3cb4351a0a463d57424a (patch)
treeb00760f78a94ea0f226cf825f26ef6db8890fdc5 /activesupport/lib
parent29a31912fcedde9e271af8a20b890f8c62e1ea79 (diff)
parent4b33fae1f52325d22083de2e83d827b924d1c616 (diff)
downloadrails-6ff506ffbc438a92cb6d3cb4351a0a463d57424a.tar.gz
rails-6ff506ffbc438a92cb6d3cb4351a0a463d57424a.tar.bz2
rails-6ff506ffbc438a92cb6d3cb4351a0a463d57424a.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/inflector.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index ba52e41c08..ad2660e6c8 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/activesupport/lib/active_support/inflector.rb
@@ -134,7 +134,6 @@ module ActiveSupport
# "octopus".pluralize # => "octopi"
# "sheep".pluralize # => "sheep"
# "words".pluralize # => "words"
- # "the blue mailman".pluralize # => "the blue mailmen"
# "CamelOctopus".pluralize # => "CamelOctopi"
def pluralize(word)
result = word.to_s.dup
@@ -154,7 +153,6 @@ module ActiveSupport
# "octopi".singularize # => "octopus"
# "sheep".singluarize # => "sheep"
# "word".singularize # => "word"
- # "the blue mailmen".singularize # => "the blue mailman"
# "CamelOctopi".singularize # => "CamelOctopus"
def singularize(word)
result = word.to_s.dup