summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/request_response.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-01-02 19:22:28 -0600
committerGitHub <noreply@github.com>2017-01-02 19:22:28 -0600
commitf01e74d21e7cadd052c1853d7fe482bd7b9970fa (patch)
treeabcec287bda4b706bfa3e6bc40601d0883206122 /docs/quick_tutorial/request_response.rst
parentfc163d411bd57b232f68ed6554aff3a3ef8f2339 (diff)
parenta36d33bf7872575fb79cdc0e5959a62b30df5742 (diff)
downloadpyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.tar.gz
pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.tar.bz2
pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.zip
Merge pull request #2889 from stevepiercy/docs-cookiecutter-changes-only
Docs cookiecutter changes only - Quick Tutorial and all other files
Diffstat (limited to 'docs/quick_tutorial/request_response.rst')
-rw-r--r--docs/quick_tutorial/request_response.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/quick_tutorial/request_response.rst b/docs/quick_tutorial/request_response.rst
index 0ac9b4f6d..ece8cdd6f 100644
--- a/docs/quick_tutorial/request_response.rst
+++ b/docs/quick_tutorial/request_response.rst
@@ -26,7 +26,7 @@ part of a web application, web developers need a robust, mature set of software
for web requests and returning web responses.
Pyramid has always fit nicely into the existing world of Python web development
-(virtual environments, packaging, scaffolding, first to embrace Python 3, and
+(virtual environments, packaging, cookiecutters, first to embrace Python 3, and
so on). Pyramid turned to the well-regarded :term:`WebOb` Python library for
request and response handling. In our example above, Pyramid hands
``hello_world`` a ``request`` that is :ref:`based on WebOb <webob_chapter>`.