Merge branch 'master' of https://github.com/rails/rails

1 files changed, 7 insertions, 7 deletions

diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb
index 64bc8f6cea..c0d5cdf2d5 100644
--- a/activesupport/lib/active_support/core_ext/string/access.rb
+++ b/activesupport/lib/active_support/core_ext/string/access.rb
@@ -4,27 +4,27 @@ class String
   unless '1.9'.respond_to?(:force_encoding)
     # Returns the character at the +position+ treating the string as an array (where 0 is the first character).
     #
-    # Examples: 
+    # Examples:
     #   "hello".at(0)  # => "h"
     #   "hello".at(4)  # => "o"
     #   "hello".at(10) # => ERROR if < 1.9, nil in 1.9
     def at(position)
       mb_chars[position, 1].to_s
     end
-    
+
     # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
     #
-    # Examples: 
+    # Examples:
     #   "hello".from(0)  # => "hello"
     #   "hello".from(2)  # => "llo"
     #   "hello".from(10) # => "" if < 1.9, nil in 1.9
     def from(position)
       mb_chars[position..-1].to_s
     end
-    
+
     # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
     #
-    # Examples: 
+    # Examples:
     #   "hello".to(0)  # => "h"
     #   "hello".to(2)  # => "hel"
     #   "hello".to(10) # => "hello"
@@ -34,7 +34,7 @@ class String
 
     # Returns the first character of the string or the first +limit+ characters.
     #
-    # Examples: 
+    # Examples:
     #   "hello".first     # => "h"
     #   "hello".first(2)  # => "he"
     #   "hello".first(10) # => "hello"
@@ -50,7 +50,7 @@ class String
 
     # Returns the last character of the string or the last +limit+ characters.
     #
-    # Examples: 
+    # Examples:
     #   "hello".last     # => "o"
     #   "hello".last(2)  # => "lo"
     #   "hello".last(10) # => "hello"