Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Doc fixes #1775, #1776 [jon@instance-design.co.uk]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1878 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 1aab0e2c30510acb0dbaf3a2f76bea0971709461 1 parent dcf5caf
@dhh dhh authored
View
2  actionpack/lib/action_controller/base.rb
@@ -469,7 +469,7 @@ def controller_name
#
# # 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
View
2  activerecord/lib/active_record/base.rb
@@ -208,7 +208,7 @@ def initialize(errors)
# * +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.
Please sign in to comment.
Something went wrong with that request. Please try again.