summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2015-02-07 10:48:10 -0800
committerJohn Anderson <sontek@gmail.com>2015-02-07 10:48:10 -0800
commit50921e94c539318cb9e1789a2f9363352a820542 (patch)
tree77430b23c95c50f79fb47e258528cec102de3e66 /docs/glossary.rst
parente094ab229eed6f8bf9e7a6a4d4406faefece41e4 (diff)
parentb17fa8b19da6e8272515588abbd2299f03bc2942 (diff)
downloadpyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.gz
pyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.bz2
pyramid-50921e94c539318cb9e1789a2f9363352a820542.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into catch_bad_request_method_name
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 01300a0be..9c0ea8598 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -16,6 +16,11 @@ 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. See
+ :class:`pyramid.interfaces.IResponseFactory`.
+
response
An object returned by a :term:`view callable` that represents response
data returned to the requesting user agent. It must implement the