diff options
author | Xavier Noria <fxn@hashref.com> | 2010-12-20 20:13:34 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-12-20 20:13:34 +0100 |
commit | 880f8419c41db0aea4b7cf3abd74fe5d32fa04a7 (patch) | |
tree | 0c21b8e0829136b6fb33a136caf3085f2a78c857 /activerecord | |
parent | 0cbfd6c28d327304432f7d0c067662b5c1e41a78 (diff) | |
parent | 6909fb6cff49e11574909b55864af8673d044eb7 (diff) | |
download | rails-880f8419c41db0aea4b7cf3abd74fe5d32fa04a7.tar.gz rails-880f8419c41db0aea4b7cf3abd74fe5d32fa04a7.tar.bz2 rails-880f8419c41db0aea4b7cf3abd74fe5d32fa04a7.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/README.rdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc index 101a595ecd..91a23da8ad 100644 --- a/activerecord/README.rdoc +++ b/activerecord/README.rdoc @@ -84,7 +84,7 @@ A short rundown of some of the major features: class CommentObserver < ActiveRecord::Observer def after_create(comment) # is called just after Comment#save - Notifications.deliver_new_comment("david@loudthinking.com", comment) + CommentMailer.new_comment_email("david@loudthinking.com", comment) end end @@ -128,7 +128,7 @@ A short rundown of some of the major features: # connect to MySQL with authentication ActiveRecord::Base.establish_connection( - :adapter => "mysql", + :adapter => "mysql2", :host => "localhost", :username => "me", :password => "secret", |