Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	activesupport/lib/active_support/core_ext/hash/slice.rb
	guides/source/active_support_core_extensions.md

1 files changed, 3 insertions, 3 deletions

diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index e4a1f9e80a..70ef589cd7 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -1,8 +1,8 @@
 module ActiveModel
 
-  # == Active Model Length Validator
+  # == Active \Model Length \Validator
   module Validations
-    class LengthValidator < EachValidator #:nodoc:
+    class LengthValidator < EachValidator # :nodoc:
       MESSAGES  = { :is => :wrong_length, :minimum => :too_short, :maximum => :too_long }.freeze
       CHECKS    = { :is => :==, :minimum => :>=, :maximum => :<= }.freeze
 
@@ -37,7 +37,7 @@ module ActiveModel
         value = tokenize(value)
         value_length = value.respond_to?(:length) ? value.length : value.to_s.length
         errors_options = options.except(*RESERVED_OPTIONS)
-        
+
         CHECKS.each do |key, validity_check|
           next unless check_value = options[key]
           next if value_length.send(validity_check, check_value)