summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-10-28 19:58:38 -0700
committerBen Bangert <ben@groovie.org>2010-10-28 19:58:38 -0700
commitd39e99e1f6f06a02a275a8a30f154e0f292d7dff (patch)
tree24a85615dce8ba575c73aae1189ea5846303ae70 /docs/glossary.rst
parent6a9d6246c9e9fda507fa04b462c00509b73f676f (diff)
parent04ebd572a92f6681209c70c42192775c63cd16cd (diff)
downloadpyramid-d39e99e1f6f06a02a275a8a30f154e0f292d7dff.tar.gz
pyramid-d39e99e1f6f06a02a275a8a30f154e0f292d7dff.tar.bz2
pyramid-d39e99e1f6f06a02a275a8a30f154e0f292d7dff.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 2e2b11aaa..93d86b664 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -803,3 +803,14 @@ Glossary
``route_url``. See
:class:`repoze.bfg.interfaces.IRoutePregenerator` for more
information.
+
+ session
+ A namespace that is valid for some period of continual activity
+ that can be used to represent a user's interaction with a web
+ application.
+
+ session factory
+ A callable, which, when called with a single argument named
+ ``request`` (a :term:`request` object), returns a
+ :term:`session` object.
+