summaryrefslogtreecommitdiff
path: root/docs/narr/paste.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:38:30 -0700
committerGitHub <noreply@github.com>2018-10-05 02:38:30 -0700
commit536caa6e0306be956a0bb281b6370effc476d38d (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/narr/paste.rst
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
parent086198b5db7dcb86c2b4edbc5d3610dcade0332a (diff)
downloadpyramid-536caa6e0306be956a0bb281b6370effc476d38d.tar.gz
pyramid-536caa6e0306be956a0bb281b6370effc476d38d.tar.bz2
pyramid-536caa6e0306be956a0bb281b6370effc476d38d.zip
Merge pull request #3346 from stloma/one_cc
updating docs for merging cookiecutters
Diffstat (limited to 'docs/narr/paste.rst')
-rw-r--r--docs/narr/paste.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst
index c02036f69..8a0d505b3 100644
--- a/docs/narr/paste.rst
+++ b/docs/narr/paste.rst
@@ -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 cookiecutters render PasteDeploy configuration files, to
+However, the Pyramid cookiecutter renders 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.
@@ -75,7 +75,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 cookiecutter-generated package, you'll see a ``main``
+generated within the 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.