summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/ini.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2015-10-20 23:19:18 -0600
committerBert JW Regeer <bertjw@regeer.org>2015-10-20 23:19:18 -0600
commit18e54fe9619fd8b2aa6006126fc1c2840e32f2c1 (patch)
treeea26bbfd681ae5d821f2cde9ac5cbe2e80f5c714 /docs/quick_tutorial/ini.rst
parentbf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff)
parentd4221720b8409eafb65b301562be327af0196c7e (diff)
downloadpyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.gz
pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.bz2
pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.zip
Merge branch 'master' of github.com:Pylons/pyramid into feature/configurable-view-deriver
Diffstat (limited to 'docs/quick_tutorial/ini.rst')
-rw-r--r--docs/quick_tutorial/ini.rst8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index b8720711b..36942c767 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -88,7 +88,7 @@ the Pyramid chapter on
- ``pserve`` looks for ``[app:main]`` and finds ``use = egg:tutorial``
-- The projects's ``setup.py`` has defined an "entry point" (lines 9-10)
+- The projects's ``setup.py`` has defined an "entry point" (lines 9-12)
for the project "main" entry point of ``tutorial:main``
- The ``tutorial`` package's ``__init__`` has a ``main`` function
@@ -131,6 +131,8 @@ Extra Credit
#. The entry point in ``setup.py`` didn't mention ``__init__.py`` when
it declared ``tutorial:main`` function. Why not?
+#. What is the purpose of ``**settings``? What does the ``**`` signify?
+
.. seealso::
:ref:`project_narr`,
:ref:`scaffolding_chapter`,
@@ -138,7 +140,3 @@ Extra Credit
:ref:`environment_chapter`,
:ref:`paste_chapter`
-Extra Credit
-============
-
-#. What is the purpose of ``**settings``? What does the ``**`` signify?