summaryrefslogtreecommitdiff
path: root/docs/narr/flash.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-29 13:57:54 -0500
committerChris McDonough <chrism@plope.com>2010-12-29 13:57:54 -0500
commit7f14c3750dcf2b79e9146b0a3750af307fd1a86b (patch)
tree198d67733a6303f3ce0c8f17e3938d0619f37ed2 /docs/narr/flash.rst
parentfcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (diff)
parent581a401c26047a6cddb6521393de4030ce0a962a (diff)
downloadpyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.tar.gz
pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.tar.bz2
pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.zip
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/narr/flash.rst')
-rw-r--r--docs/narr/flash.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/flash.rst b/docs/narr/flash.rst
index 71c6cf305..037bfc416 100644
--- a/docs/narr/flash.rst
+++ b/docs/narr/flash.rst
@@ -87,8 +87,8 @@ been popped.
The object returned from ``pop_flash`` is a list.
-Using the ``session.pop_flash`` Method
---------------------------------------
+Using the ``session.peek_flash`` Method
+---------------------------------------
Once one or more messages has been added to a flash queue by the
``session.flash`` API, the ``session.peek_flash`` API can be used to "peek"