diff options
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 | ||||
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index d19990d155..849b834cd1 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -469,7 +469,7 @@ module ActionController #:nodoc: # # # Renders the template for the action "long_goal" within the current controller, # # but with a custom layout - # render :action => "short_goal", :layout => "spectacular" + # render :action => "long_goal", :layout => "spectacular" # # _Deprecation_ _notice_: This used to have the signatures <tt>render_action("action", status = 200)</tt>, # <tt>render_without_layout("controller/action", status = 200)</tt>, and diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 936e61a688..8420fe2ffe 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -208,7 +208,7 @@ module ActiveRecord #:nodoc: # * +ActiveRecordError+ -- generic error class and superclass of all other errors raised by Active Record # * +AdapterNotSpecified+ -- the configuration hash used in <tt>establish_connection</tt> didn't include a # <tt>:adapter</tt> key. - # * +AdapterNotSpecified+ -- the <tt>:adapter</tt> key used in <tt>establish_connection</tt> specified an non-existent adapter + # * +AdapterNotFound+ -- the <tt>:adapter</tt> key used in <tt>establish_connection</tt> specified an non-existent adapter # (or a bad spelling of an existing one). # * +AssociationTypeMismatch+ -- the object assigned to the association wasn't of the type specified in the association definition. # * +SerializationTypeMismatch+ -- the object serialized wasn't of the class specified as the second parameter. |