diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
| commit | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (patch) | |
| tree | 695d4b5e5ae974d0770acfbe9b8231ea1c71288a /docs/glossary.rst | |
| parent | d35a916095943b020f30acb90e878abe9bfd4fb1 (diff) | |
| parent | 4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (diff) | |
| download | pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.gz pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.bz2 pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.zip | |
Merge branch 'master' into feature.re-entrant-config
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
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 |
