summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/basiclayout.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-06 05:40:58 -0400
committerChris McDonough <chrism@plope.com>2011-10-06 05:40:58 -0400
commit87dbfa4cd26171414d971d4f56f2aceaceb9a6eb (patch)
tree38876d7fe78e1b32763fa185f0dc9546e113671a /docs/tutorials/wiki2/basiclayout.rst
parent206a7f6eb776ff91043ce9cf4627dad20f68b937 (diff)
parent75f05a60f8754c9c5c234b9731dbc08646ba89a9 (diff)
downloadpyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.tar.gz
pyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.tar.bz2
pyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.zip
Merge branch 'feature.glue'
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 2d25ace00..8dc886373 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -18,7 +18,7 @@ an ``__init__.py`` file. Even if empty, this marks a directory as a Python
package. We use ``__init__.py`` both as a package marker and to contain
configuration code.
-The generated ``development.ini`` file is read by ``paster`` which looks for
+The generated ``development.ini`` file is read by ``pserve`` which looks for
the application module in the ``use`` variable of the ``app:main``
section. The *entry point* is defined in the Setuptools configuration of this
module, specifically in the ``setup.py`` file. For this tutorial, the *entry