aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-09-23 22:35:08 +0200
committerXavier Noria <fxn@hashref.com>2010-09-23 22:35:08 +0200
commit8c0c815ba711c439cbc4d295c423d5d6ab0bb848 (patch)
tree46ebc98a50a631a8962cb48505f75454cd8f24f1 /actionpack/lib/action_controller
parentafdf86e8ee7c64915515e7ad8930efd858fceb43 (diff)
parent5965219ca2230dc46cff2feace19d83b7493f440 (diff)
downloadrails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.tar.gz
rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.tar.bz2
rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.zip
resolves rdoc conflict
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 631a0f2945..48308cbb60 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -93,9 +93,9 @@ module ActionController
# * ActiveRecord::SessionStore - Sessions are stored in your database, which works better than PStore with multiple app servers and,
# unlike CookieStore, hides your session contents from the user. To use ActiveRecord::SessionStore, set
#
- # config.action_controller.session_store = :active_record_store
+ # MyApplication::Application.config.session_store :active_record_store
#
- # in your <tt>config/environment.rb</tt> and run <tt>rake db:sessions:create</tt>.
+ # in your <tt>config/initializers/session_store.rb</tt> and run <tt>script/rails g session_migration</tt>.
#
# == Responses
#