summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-11 12:32:26 -0600
committerMichael Merickel <michael@merickel.org>2015-02-11 12:32:35 -0600
commit6e9e2dbb364f371b034b681dd44e6e6b831c5760 (patch)
treeb7d8c623706f5df330d9c72d4e1c9d84dd47b6cd /docs/glossary.rst
parent14126cae5cf308ed466ed3eea576094e9c2193b4 (diff)
parent1dc1f28e1184960f5359c6c510d23a0e6e9dafe8 (diff)
downloadpyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.gz
pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.bz2
pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.zip
Merge branch 'master' into feature.py3-coverage
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