aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-20 14:14:54 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-20 14:14:54 -0700
commit71ef72c3d01ddf8bf18e873d928836c3e72465e8 (patch)
tree60de075345560cb7d328b0a58ce0de96b20fb85f /actionpack
parent77dfcae38504993bebb85849b73eef829849b0b7 (diff)
parentdfd03fdbd32d25ef0f70e40ab7cb3794b1ffe0c0 (diff)
downloadrails-71ef72c3d01ddf8bf18e873d928836c3e72465e8.tar.gz
rails-71ef72c3d01ddf8bf18e873d928836c3e72465e8.tar.bz2
rails-71ef72c3d01ddf8bf18e873d928836c3e72465e8.zip
Merge pull request #2597 from dharmatech/patch-2
actionpack/lib/action_controller/base.rb: docs typo
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ce56d8bc71..da93c988c4 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -63,7 +63,7 @@ module ActionController
#
# == Sessions
#
- # Sessions allows you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
+ # Sessions allow you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
# such as a Signup object constructed in a multi-paged process, or objects that don't change much and are needed all the time, such
# as a User object for a system that requires login. The session should not be used, however, as a cache for objects where it's likely
# they could be changed unknowingly. It's usually too much work to keep it all synchronized -- something databases already excel at.