aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-29 02:42:31 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-29 02:42:31 +0000
commitd3017e225fdc2b3be0905ca0d525d190da0edc91 (patch)
treea89679f6d14e047bb670b9af7cd1555c857c81ea /actionpack
parentaf2ebb29da7f77e145202e9e5ee4081ce6b85a93 (diff)
downloadrails-d3017e225fdc2b3be0905ca0d525d190da0edc91.tar.gz
rails-d3017e225fdc2b3be0905ca0d525d190da0edc91.tar.bz2
rails-d3017e225fdc2b3be0905ca0d525d190da0edc91.zip
Correct flash discard rdoc. Closes #8502 [kampers]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6887 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/flash.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
index 534c74745e..ac38b46f68 100644
--- a/actionpack/lib/action_controller/flash.rb
+++ b/actionpack/lib/action_controller/flash.rb
@@ -98,8 +98,8 @@ module ActionController #:nodoc:
# Marks the entire flash or a single flash entry to be discarded by the end of the current action
#
- # flash.keep # keep entire flash available for the next action
- # flash.discard(:warning) # discard the "warning" entry (it'll still be available for the current action)
+ # flash.discard # discard the entire flash at the end of the current action
+ # flash.discard(:warning) # discard only the "warning" entry at the end of the current action
def discard(k = nil)
use(k)
end