summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2015-01-01 22:18:45 -0800
committerJohn Anderson <sontek@gmail.com>2015-01-01 22:18:45 -0800
commit35d64fd7ff6e1caf7cf43e94039c2748fd86dfbe (patch)
treeb19a2833212cd2d877250e606c0b726fca706c21 /docs/glossary.rst
parent22c836ecbc6f10c4851d88017243f91e469016aa (diff)
parent0414b7c7b2e3ea45d4dcbdf273a9e332238a0f50 (diff)
downloadpyramid-35d64fd7ff6e1caf7cf43e94039c2748fd86dfbe.tar.gz
pyramid-35d64fd7ff6e1caf7cf43e94039c2748fd86dfbe.tar.bz2
pyramid-35d64fd7ff6e1caf7cf43e94039c2748fd86dfbe.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into support_more_features_in_routes
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 01300a0be..911c22075 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -16,6 +16,10 @@ Glossary
An object which, provided a :term:`WSGI` environment as a single
positional argument, returns a Pyramid-compatible request.
+ response factory
+ An object which, provided a :term:`request` as a single positional
+ argument, returns a Pyramid-compatible response.
+
response
An object returned by a :term:`view callable` that represents response
data returned to the requesting user agent. It must implement the