summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-02 17:47:17 -0400
committerChris McDonough <chrism@plope.com>2013-10-02 17:47:17 -0400
commitab2fedf7adaec0a56a69beed35312c88d7961c6c (patch)
tree83a49d859af4dca42e83c2397599a0b9de154b72 /docs
parent4122733091d0204b22d7acedfdf985caed17f93f (diff)
downloadpyramid-ab2fedf7adaec0a56a69beed35312c88d7961c6c.tar.gz
pyramid-ab2fedf7adaec0a56a69beed35312c88d7961c6c.tar.bz2
pyramid-ab2fedf7adaec0a56a69beed35312c88d7961c6c.zip
fix the docs build and get rid of stray references to Beaker
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst9
-rw-r--r--docs/narr/project.rst2
-rw-r--r--docs/narr/sessions.rst8
-rw-r--r--docs/quick_tour.rst7
4 files changed, 16 insertions, 10 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 7dc69c7c4..398f945a4 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1009,7 +1009,8 @@ Glossary
Green Unicorn
Aka ``gunicorn``, a fast :term:`WSGI` server that runs on UNIX under
- Python 2.6+ or Python 3.1+. See http://gunicorn.org/ for detailed information.
+ Python 2.6+ or Python 3.1+. See http://gunicorn.org/ for detailed
+ information.
predicate factory
A callable which is used by a third party during the registration of a
@@ -1021,3 +1022,9 @@ Glossary
A Python :term:`distribution` that uses Pyramid's extensibility
to plug into a Pyramid application and provide extra,
configurable services.
+
+ pyramid_redis_sessions
+ A package by Eric Rasmussen which allows you to store Pyramid session
+ data in a Redis database. See
+ https://pypi.python.org/pypi/pyramid_redis_sessions for more information.
+
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index bfd00d3a0..9451f41b1 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -977,7 +977,7 @@ named ``views`` instead of within a single ``views.py`` file, you might:
- *Move* the existing ``views.py`` file to a file inside the new ``views``
directory named, say, ``blog.py``. Because the ``templates`` directory
remains in the ``myproject`` package, the template :term:`asset
- specification`s in ``blog.py`` must now be fully qualified with the
+ specification` values in ``blog.py`` must now be fully qualified with the
project's package name (``myproject:templates/blog.pt``).
You can then continue to add view callable functions to the ``blog.py``
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index f4da5d82a..649d22bd2 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -159,10 +159,10 @@ Some gotchas:
Using Alternate Session Factories
---------------------------------
-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.
+At the time of this writing, exactly one project-endorsed alternate session
+factory exists named :term:`pyramid_redis_sessions`. It can be downloaded from
+PyPI. It uses the Redis database as a backend. It is the recommended
+persistent session solution at the time of this writing.
.. index::
single: session factory (custom)
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
=========