diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-14 13:22:41 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-14 13:22:41 +0200 |
| commit | b7e7e56eb797efe9f8b2feeeea2d643c18269b44 (patch) | |
| tree | c7dc6d2412335fe7e6ad3c11c3acaddcf9e6a98e | |
| parent | b7fdc937fafb96134a484ee68669899f66f02637 (diff) | |
| parent | e5163784102e3ce97b99dd50b35b18868dc3c3b5 (diff) | |
| download | rails-b7e7e56eb797efe9f8b2feeeea2d643c18269b44.tar.gz rails-b7e7e56eb797efe9f8b2feeeea2d643c18269b44.tar.bz2 rails-b7e7e56eb797efe9f8b2feeeea2d643c18269b44.zip | |
Merge remote branch 'docrails/master'
| -rw-r--r-- | actionpack/lib/action_view/render/partials.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb index 459aae94a2..92cdbfb3af 100644 --- a/actionpack/lib/action_view/render/partials.rb +++ b/actionpack/lib/action_view/render/partials.rb @@ -56,7 +56,7 @@ module ActionView # you're following its conventions for RecordIdentifier#partial_path. Examples: # # # @account is an Account instance, so it uses the RecordIdentifier to replace - # # <%= render :partial => "accounts/account", :locals => { :account => @buyer } %> + # # <%= render :partial => "accounts/account", :locals => { :account => @account} %> # <%= render :partial => @account %> # # # @posts is an array of Post instances, so it uses the RecordIdentifier to replace 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 6891c66839..6283bd0981 100644 --- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb +++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb @@ -7,7 +7,7 @@ end # It is recommend 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 -# deprected but <tt>class_attribute</tt> is faster. +# deprecated but <tt>class_attribute</tt> is faster. # # Allows attributes to be shared within an inheritance hierarchy. Each descendant gets a copy of # their parents' attributes, instead of just a pointer to the same. This means that the child can add elements |