summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-27 00:27:29 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-27 00:27:29 -0800
commit0a11d04513d38f560d0e147eeb7d0c1d9d4ac261 (patch)
tree7bd8aef58de325aeb03b1d99e3055958223b88a1
parent2d35e2fd2d893f580052e8c5840a9238edaecacd (diff)
downloadpyramid-0a11d04513d38f560d0e147eeb7d0c1d9d4ac261.tar.gz
pyramid-0a11d04513d38f560d0e147eeb7d0c1d9d4ac261.tar.bz2
pyramid-0a11d04513d38f560d0e147eeb7d0c1d9d4ac261.zip
narr/paste - update
-rw-r--r--docs/narr/paste.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst
index 0a217e6e3..a3f1b866e 100644
--- a/docs/narr/paste.rst
+++ b/docs/narr/paste.rst
@@ -3,7 +3,7 @@
PasteDeploy Configuration Files
===============================
-Packages generated via a :term:`scaffold` make use of a system created by Ian
+Packages generated via a :term:`cookiecutter` make use of a system created by Ian
Bicking named :term:`PasteDeploy`. PasteDeploy defines a way to declare
:term:`WSGI` application configuration in an ``.ini`` file.
@@ -14,7 +14,7 @@ runner ``pserve``, as well as other commands such as ``pviews``, ``pshell``,
PasteDeploy is not a particularly integral part of Pyramid. It's possible to
create a Pyramid application which does not use PasteDeploy at all. We show a
Pyramid application that doesn't use PasteDeploy in :ref:`firstapp_chapter`.
-However, all Pyramid scaffolds render PasteDeploy configuration files, to
+However, all Pyramid cookiecutters render PasteDeploy configuration files, to
provide new developers with a standardized way of setting deployment values,
and to provide new users with a standardized way of starting, stopping, and
debugging an application.
@@ -80,7 +80,7 @@ In English, this entry point can thus be referred to as a "PasteDeploy
application factory in the ``MyProject`` project which has the entry point
named ``main`` where the entry point refers to a ``main`` function in the
``mypackage`` module". Indeed, if you open up the ``__init__.py`` module
-generated within any scaffold-generated package, you'll see a ``main``
+generated within any cookiecutter-generated package, you'll see a ``main``
function. This is the function called by :term:`PasteDeploy` when the
``pserve`` command is invoked against our application. It accepts a global
configuration object and *returns* an instance of our application.