summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-12-06 08:17:31 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-12-06 08:17:31 -0700
commitd2da2ee8333b7d134b3a50d5dd43c72ba029522f (patch)
tree1c0bc3f52263d1bb31ce216e8132abb8914bdb6f /docs/tutorials
parent4ba3856046051fcb55585ab69fc5043a50c059a1 (diff)
parentb4ddae4694c94a9b1281aab9f3ca5f21979d203b (diff)
downloadpyramid-d2da2ee8333b7d134b3a50d5dd43c72ba029522f.tar.gz
pyramid-d2da2ee8333b7d134b3a50d5dd43c72ba029522f.tar.bz2
pyramid-d2da2ee8333b7d134b3a50d5dd43c72ba029522f.zip
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 01fdd351e..a9f7b2282 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -19,12 +19,12 @@ 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.
-When you run the application using the ``paster`` command using the
-``development.ini`` generated config file, the application configuration
-points at an Setuptools *entry point* described as ``egg:tutorial#app``. In
-our application, because the application's ``setup.py`` file says so, this
-entry point happens to be the ``app`` function within the file named
-``__init__.py``:
+The generated ``development.ini`` file is read by ``paster`` which looks for
+the application module in the ``use`` variable of the ``app:tutorial``
+section. The *entry point* is defined in the Setuptools configuration of this
+module, specifically in the ``setup.py`` file. For this tutorial, the *entry
+point* is defined as ``tutorial:main`` and points to the following ``main``
+function:
.. literalinclude:: src/basiclayout/tutorial/__init__.py
:linenos: