diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-19 04:46:41 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-19 04:46:41 -0400 |
| commit | 68c60204490ba104c592d4de322ce21bdf6df0d3 (patch) | |
| tree | 799aa2aef543aa4c9c22227d3416d74dd0df4c10 /docs/glossary.rst | |
| parent | 68c25d39f9c0531be2916ad433904c7247c0f5c7 (diff) | |
| parent | 643a83473a6faabd0ff08547a0cbca09e9cdda1c (diff) | |
| download | pyramid-68c60204490ba104c592d4de322ce21bdf6df0d3.tar.gz pyramid-68c60204490ba104c592d4de322ce21bdf6df0d3.tar.bz2 pyramid-68c60204490ba104c592d4de322ce21bdf6df0d3.zip | |
Merge branch 'master' into 1.4-branch
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 2b006da20..96dd826d1 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -818,9 +818,12 @@ Glossary application. session factory - A callable, which, when called with a single argument named - ``request`` (a :term:`request` object), returns a - :term:`session` object. + A callable, which, when called with a single argument named ``request`` + (a :term:`request` object), returns a :term:`session` object. See + :ref:`using_the_default_session_factory`, + :ref:`using_alternate_session_factories` and + :meth:`pyramid.config.Configurator.set_session_factory` for more + information. Mako `Mako <http://www.makotemplates.org/>`_ is a template language language |