diff options
-rw-r--r-- | activemodel/lib/active_model/validations/exclusion.rb | 2 | ||||
-rw-r--r-- | activemodel/lib/active_model/validations/inclusion.rb | 2 | ||||
-rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
-rw-r--r-- | activesupport/CHANGELOG | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb index 85ecf78a06..a17c517baa 100644 --- a/activemodel/lib/active_model/validations/exclusion.rb +++ b/activemodel/lib/active_model/validations/exclusion.rb @@ -11,7 +11,7 @@ module ActiveModel # # Configuration options: # * <tt>in</tt> - An enumerable object of items that the value shouldn't be part of - # * <tt>message</tt> - Specifies a customer error message (default is: "is reserved") + # * <tt>message</tt> - Specifies a custom error message (default is: "is reserved") # * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false) # * <tt>allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is: false) # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb index 0c9dce92b4..2cfa1d6107 100644 --- a/activemodel/lib/active_model/validations/inclusion.rb +++ b/activemodel/lib/active_model/validations/inclusion.rb @@ -11,7 +11,7 @@ module ActiveModel # # Configuration options: # * <tt>in</tt> - An enumerable object of available items - # * <tt>message</tt> - Specifies a customer error message (default is: "is not included in the list") + # * <tt>message</tt> - Specifies a custom error message (default is: "is not included in the list") # * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false) # * <tt>allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is: false) # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index d1772ca735..6048a6aafc 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,7 +1,5 @@ *SVN* -* Improve documentation. [Xavier Noria] - * Fixed that to_param should be used and honored instead of hardcoding the id #11406 [gspiers] * Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria, Sunny Ripert] diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 79522a0f0e..d9e0635295 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Improve documentation. [Xavier Noria] + * Modified ActiveSupport::Callbacks::Callback#call to accept multiple arguments. * Time #yesterday and #tomorrow behave correctly crossing DST boundary. Closes #7399 [sblackstone] |