Merge pull request #16948 from akshay-vishnoi/docs-rails-4point2

[ci skip] ActiveSupport CHANGELOG fixes

2 files changed, 21 insertions, 20 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 8b671a8c27..f80f4fada2 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -24,7 +24,7 @@
     *Kostiantyn Kahanskyi*
 
 *   Introduced new configuration option `active_support.test_order` for
-    specifying the order test cases are executed. This option currently defaults
+    specifying the order in which test cases are executed. This option currently defaults
     to `:sorted` but will be changed to `:random` in Rails 5.0.
 
     *Akira Matsuda*, *Godfrey Chan*
@@ -47,7 +47,7 @@
     *Peter Jaros*
 
 *   `determine_constant_from_test_name` does no longer shadow `NameError`s
-    which happen during constant autoloading.
+    which happens during constant autoloading.
 
     Fixes #9933.
 
@@ -149,17 +149,17 @@
     `ActiveSupport::TimeWithZone#-` should return the same result as if we were
     using `Time#-`:
 
-        Time.now.end_of_day - Time.now.beginning_of_day #=> 86399.999999999
+        Time.now.end_of_day - Time.now.beginning_of_day # => 86399.999999999
 
     Before:
 
-        Time.zone.now.end_of_day.nsec #=> 999999999
-        Time.zone.now.end_of_day - Time.zone.now.beginning_of_day #=> 86400.0
+        Time.zone.now.end_of_day.nsec # => 999999999
+        Time.zone.now.end_of_day - Time.zone.now.beginning_of_day # => 86400.0
 
     After:
 
         Time.zone.now.end_of_day - Time.zone.now.beginning_of_day
-        #=> 86399.999999999
+        # => 86399.999999999
 
     *Gordon Chan*
 
@@ -168,12 +168,12 @@
     Before:
 
         ActiveSupport::NumberHelper.number_to_rounded Rational(1000, 3), precision: 2
-        #=> "330.00"
+        # => "330.00"
 
     After:
 
         ActiveSupport::NumberHelper.number_to_rounded Rational(1000, 3), precision: 2
-        #=> "333.33"
+        # => "333.33"
 
     See #15379.
 
@@ -255,9 +255,9 @@
 
     *Xavier Noria*
 
-*   Fixed backward compatibility isues introduced in 326e652.
+*   Fixed backward compatibility issues introduced in 326e652.
 
-    Empty Hash or Array should not present in serialization result.
+    Empty Hash or Array should not be present in serialization result.
 
         {a: []}.to_query # => ""
         {a: {}}.to_query # => ""
@@ -276,20 +276,20 @@
 
     This fixes the current situation of:
 
-        1.second.eql?(1.second) #=> false
+        1.second.eql?(1.second) # => false
 
     `eql?` also requires that the other object is an `ActiveSupport::Duration`.
     This requirement makes `ActiveSupport::Duration`'s behavior consistent with
     the behavior of Ruby's numeric types:
 
-        1.eql?(1.0) #=> false
-        1.0.eql?(1) #=> false
+        1.eql?(1.0) # => false
+        1.0.eql?(1) # => false
 
-        1.second.eql?(1) #=> false (was true)
-        1.eql?(1.second) #=> false
+        1.second.eql?(1) # => false (was true)
+        1.eql?(1.second) # => false
 
         { 1 => "foo", 1.0 => "bar" }
-        #=> { 1 => "foo", 1.0 => "bar" }
+        # => { 1 => "foo", 1.0 => "bar" }
 
         { 1 => "foo", 1.second => "bar" }
         # now => { 1 => "foo", 1.second => "bar" }
@@ -297,11 +297,11 @@
 
     And though the behavior of these hasn't changed, for reference:
 
-        1 == 1.0 #=> true
-        1.0 == 1 #=> true
+        1 == 1.0 # => true
+        1.0 == 1 # => true
 
-        1 == 1.second #=> true
-        1.second == 1 #=> true
+        1 == 1.second # => true
+        1.second == 1 # => true
 
     *Emily Dobervich*
 
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index a943752f17..38d567c014 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -199,6 +199,7 @@ class String
   #   'employee_salary'.humanize              # => "Employee salary"
   #   'author_id'.humanize                    # => "Author"
   #   'author_id'.humanize(capitalize: false) # => "author"
+  #   '_id'.humanize                          # => "Id"
   def humanize(options = {})
     ActiveSupport::Inflector.humanize(self, options)
   end