aboutsummaryrefslogtreecommitdiffstats
path: root/railties/doc/guides
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-01-14 15:36:27 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-01-14 15:36:27 +0000
commitdeb597d63db0c903ce0ff70ab53abed60f95192a (patch)
tree52cd072f2e666baa0286aea741c365d7cb30f42f /railties/doc/guides
parente46c80765525817a89b784e6336a9f66250d53fc (diff)
parent9bcf01b23c25e640da7908ac8b1b49fbf7d2e51a (diff)
downloadrails-deb597d63db0c903ce0ff70ab53abed60f95192a.tar.gz
rails-deb597d63db0c903ce0ff70ab53abed60f95192a.tar.bz2
rails-deb597d63db0c903ce0ff70ab53abed60f95192a.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/doc/guides')
-rw-r--r--railties/doc/guides/source/security.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/doc/guides/source/security.txt b/railties/doc/guides/source/security.txt
index 9b3f47932e..b4e8bb4b41 100644
--- a/railties/doc/guides/source/security.txt
+++ b/railties/doc/guides/source/security.txt
@@ -93,7 +93,7 @@ That means the security of this storage depends on this secret (and of the diges
....................................
config.action_controller.session = {
- :session_key => ‘_app_session’,
+ :key => ‘_app_session’,
:secret => ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’
}
....................................