summaryrefslogtreecommitdiff
path: root/docs/quick_tour.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-02 19:02:46 -0400
committerChris McDonough <chrism@plope.com>2013-10-02 19:02:46 -0400
commit95d032468d5d445c64f6065e4b4b2889fa853e31 (patch)
tree66bb56b03f2df802dd0836d017a59f993bcf86c8 /docs/quick_tour.rst
parent66be39bf656a2840931603bc959e38ff95e53164 (diff)
parent61d1f729f4d9cc17a5fbcff0612512bc9f5fe7a2 (diff)
downloadpyramid-95d032468d5d445c64f6065e4b4b2889fa853e31.tar.gz
pyramid-95d032468d5d445c64f6065e4b4b2889fa853e31.tar.bz2
pyramid-95d032468d5d445c64f6065e4b4b2889fa853e31.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tour.rst')
-rw-r--r--docs/quick_tour.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 98584e608..2db18c8a7 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -729,8 +729,8 @@ that requires semi-permanent data to be saved. For example, a shopping
cart. This is called a :term:`session`.
Pyramid has basic built-in support for sessions, with add-ons such as
-*Beaker* (or your own custom sessioning engine) that provide richer
-session support. Let's take a look at the
+``pyramid_redis_sessions`` (or your own custom sessioning engine) that provide
+richer session support. Let's take a look at the
:doc:`built-in sessioning support <../narr/sessions>`. In our
``__init__.py`` we first import the kind of sessioning we want:
@@ -768,8 +768,7 @@ Jinja2 template:
.. seealso:: See Also:
:ref:`Quick Tutorial Sessions <qtut_sessions>`,
:ref:`sessions_chapter`, :ref:`flash_messages`,
- :ref:`session_module`, and
- :ref:`Beaker sessioning middleware <beaker:overview>`
+ :ref:`session_module`, and :term:`pyramid_redis_sessions`.
Databases
=========