diff options
| author | Chris McDonough <chrism@plope.com> | 2015-03-11 12:41:21 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-03-11 12:41:21 -0400 |
| commit | b58909676c28080c320fdb4861b7a49f5728a3aa (patch) | |
| tree | 87d4da217a1609f2229fcda73acdde34e8532944 /docs/glossary.rst | |
| parent | c0070c95eeb39186c7c2ea0dea6b972c5782f185 (diff) | |
| parent | 8ebde50fdc7322e82b96ad103ab168b92ca2b74a (diff) | |
| download | pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.gz pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.bz2 pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.zip | |
fix merge conflicts after merging master to fix.view-lookup branch; do the merge to see diffs more clearly
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 911c22075..9c0ea8598 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -18,7 +18,8 @@ Glossary response factory An object which, provided a :term:`request` as a single positional - argument, returns a Pyramid-compatible response. + argument, returns a Pyramid-compatible response. See + :class:`pyramid.interfaces.IResponseFactory`. response An object returned by a :term:`view callable` that represents response |