diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
| commit | 9c3c9a8075f250122d7827a71b6217213180fe70 (patch) | |
| tree | 39ebca0f2dbdd352a1d94d17c33acbb61a02393a /docs/narr/sessions.rst | |
| parent | af5fa07ca2fcc48ab357c0db4e1301bb960addca (diff) | |
| parent | a2d4c260952a8e2329df0c4a66d7239f2e8d0652 (diff) | |
| download | pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.gz pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.bz2 pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.zip | |
fix merge conflict
Diffstat (limited to 'docs/narr/sessions.rst')
| -rw-r--r-- | docs/narr/sessions.rst | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst index 358977089..f8279b0a5 100644 --- a/docs/narr/sessions.rst +++ b/docs/narr/sessions.rst @@ -146,8 +146,6 @@ Some gotchas: you've changed sessioning data. .. index:: - single: pyramid_beaker - single: Beaker single: pyramid_redis_sessions single: session factory (alternates) @@ -156,20 +154,11 @@ Some gotchas: Using Alternate Session Factories --------------------------------- -At the time of this writing, exactly two alternate session factories -exist. - -The first is named ``pyramid_redis_sessions``. It can be downloaded from PyPI. +At the time of this writing, exactly one project-endorsed alternate session +factory exists named``pyramid_redis_sessions``. It can be downloaded from PyPI. It uses Redis as a backend. It is the recommended persistent session solution at the time of this writing. -The second is named ``pyramid_beaker``. This is a session factory that uses the -`Beaker <http://beaker.groovie.org/>`_ library as a backend. Beaker has -support for file-based sessions, database based sessions, and encrypted -cookie-based sessions. See `the pyramid_beaker documentation -<http://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/>`_ for more -information about ``pyramid_beaker``. - .. index:: single: session factory (custom) |