diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-17 13:28:33 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-17 13:28:33 +0200 |
| commit | 137e4e759a7360f6277ec469d165894bf96dbabf (patch) | |
| tree | 8b2740e78b8c22302c1a20dae5364d3711b24499 /activesupport/lib/active_support | |
| parent | f1b33f7f22b7cddb7a80afbfa134a62600391b22 (diff) | |
| parent | 285690143ea80fe504385a409cdc28f0d9b7ada2 (diff) | |
| download | rails-137e4e759a7360f6277ec469d165894bf96dbabf.tar.gz rails-137e4e759a7360f6277ec469d165894bf96dbabf.tar.bz2 rails-137e4e759a7360f6277ec469d165894bf96dbabf.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb index 6283bd0981..7a6a0be69d 100644 --- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb +++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb @@ -5,7 +5,7 @@ require 'active_support/core_ext/array/extract_options' module ClassInheritableAttributes # :nodoc: end -# It is recommend to use <tt>class_attribute</tt> over methods defined in this file. Please +# It is recommended to use <tt>class_attribute</tt> over methods defined in this file. Please # refer to documentation for <tt>class_attribute</tt> for more information. Officially it is not # deprecated but <tt>class_attribute</tt> is faster. # |