Permalink
Browse files

Merge remote branch 'docrails/master'

  • Loading branch information...
2 parents b7fdc93 + e516378 commit b7e7e56eb797efe9f8b2feeeea2d643c18269b44 @fxn fxn committed Aug 14, 2010
@@ -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
@@ -7,7 +7,7 @@ module ClassInheritableAttributes # :nodoc:
# 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

0 comments on commit b7e7e56

Please sign in to comment.