summaryrefslogtreecommitdiff
path: root/docs/quick_tour.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-27 02:44:48 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-27 02:44:48 -0800
commitd5b5d0829ccab21d8eeb24cb0be54c62cb5ebf80 (patch)
tree5eb6ae10ef3c8026816c9e879a5a776c721ac67d /docs/quick_tour.rst
parentaf33f7133018b8821597cb885ea5c03f225ab77c (diff)
downloadpyramid-d5b5d0829ccab21d8eeb24cb0be54c62cb5ebf80.tar.gz
pyramid-d5b5d0829ccab21d8eeb24cb0be54c62cb5ebf80.tar.bz2
pyramid-d5b5d0829ccab21d8eeb24cb0be54c62cb5ebf80.zip
quicktour - moar updates for cookiecutters
Diffstat (limited to 'docs/quick_tour.rst')
-rw-r--r--docs/quick_tour.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 186cab29e..053846276 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -116,7 +116,7 @@ part of a web application, web developers need a robust, mature set of software
for web requests.
Pyramid has always fit nicely into the existing world of Python web development
-(virtual environments, packaging, scaffolding, one of the first to embrace
+(virtual environments, packaging, cookiecutters, one of the first to embrace
Python 3, etc.). 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>`.
@@ -547,7 +547,7 @@ Let's look at ``pserve`` and configuration in more depth.
.. seealso:: See also:
:ref:`Quick Tutorial Cookiecutters <qtut_cookiecutters>`,
:ref:`project_narr`, and
- :doc:`../narr/scaffolding`
+ :doc:`../narr/cookiecutters`
Application running with ``pserve``
===================================
@@ -613,7 +613,7 @@ We have a few decisions made for us in this configuration:
#. *Interfaces:* ``listen = 127.0.0.1:6543 [::1]:6543`` tells ``waitress`` to listen on all interfaces on port 6543 for both IPv4 and IPv6.
-Additionally the ``development.ini`` generated by this scaffold wired up
+Additionally the ``development.ini`` generated by this cookiecutter wired up
Python's standard logging. We'll now see in the console, for example, a log on
every request that comes in, as well as traceback information.
@@ -893,7 +893,7 @@ database with tables. Let's run it, then start the application:
$ $VENV/bin/pserve development.ini
The ORM eases the mapping of database structures into a programming language.
-SQLAlchemy uses "models" for this mapping. The scaffold generated a sample
+SQLAlchemy uses "models" for this mapping. The cookiecutter generated a sample
model:
.. literalinclude:: quick_tour/sqla_demo/sqla_demo/models/mymodel.py