summaryrefslogtreecommitdiff
path: root/docs/narr/startup.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/narr/startup.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/narr/startup.rst')
-rw-r--r--docs/narr/startup.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index 1be8037a3..cf4612602 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -50,7 +50,7 @@ Here's a high-level time-ordered overview of what happens when you press
application or a pipeline, you're using a "composite" (e.g.,
``[composite:main]``), refer to the documentation for that particular
composite to understand how to make it refer to your :app:`Pyramid`
- application. In most cases, a Pyramid application built from a scaffold
+ application. In most cases, a Pyramid application built from a cookiecutter
will have a single ``[app:main]`` section in it, and this will be the
application served.
@@ -70,7 +70,7 @@ Here's a high-level time-ordered overview of what happens when you press
:app:`Pyramid` :term:`router` instance. Here's the contents of an example
``__init__.py`` module:
- .. literalinclude:: MyProject/myproject/__init__.py
+ .. literalinclude:: myproject/myproject/__init__.py
:language: python
:linenos:
@@ -86,12 +86,12 @@ Here's a high-level time-ordered overview of what happens when you press
Our generated ``development.ini`` file looks like so:
- .. literalinclude:: MyProject/development.ini
+ .. literalinclude:: myproject/development.ini
:language: ini
:linenos:
In this case, the ``myproject.__init__:main`` function referred to by the
- entry point URI ``egg:MyProject`` (see :ref:`MyProject_ini` for more
+ entry point URI ``egg:myproject`` (see :ref:`myproject_ini` for more
information about entry point URIs, and how they relate to callables) will
receive the key/value pairs ``{pyramid.reload_templates = true,
pyramid.debug_authorization = false, pyramid.debug_notfound = false,