summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/basiclayout.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-10 14:45:53 -0500
committerChris McDonough <chrism@plope.com>2010-11-10 14:45:53 -0500
commitc44c409de71f0995f7c9187c40f506b5d026f85a (patch)
tree3b4fc282ea69f945ec110d10c23da5de1f27a99d /docs/tutorials/wiki/basiclayout.rst
parenta3ceb6cea0bad0ecd526a8033d7baf8465de9872 (diff)
downloadpyramid-c44c409de71f0995f7c9187c40f506b5d026f85a.tar.gz
pyramid-c44c409de71f0995f7c9187c40f506b5d026f85a.tar.bz2
pyramid-c44c409de71f0995f7c9187c40f506b5d026f85a.zip
fix wiki tutorial based on changes to zodb paster template
Diffstat (limited to 'docs/tutorials/wiki/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki/basiclayout.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 85cfc825b..c05a53831 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -30,32 +30,32 @@ entry point happens to be the ``app`` function within the file named
:linenos:
:language: py
-#. *Lines 1-2*. Perform some dependency imports.
+#. *Lines 1-3*. Perform some dependency imports.
-#. *Line 12*. Get the ZODB configuration from the ``development.ini``
+#. *Line 8*. Get the ZODB configuration from the ``development.ini``
file's ``[app:main]`` section represented by the ``settings``
dictionary passed to our ``app`` function. This will be a URI
(something like ``file:///path/to/Data.fs``).
-#. *Line 15*. We create a "finder" object using the
+#. *Line 12*. We create a "finder" object using the
``PersistentApplicationFinder`` helper class, passing it the ZODB
URI and the "appmaker" we've imported from ``models.py``.
-#. *Lines 16 - 17*. We create a :term:`root factory` which uses the
+#. *Lines 13 - 14*. We create a :term:`root factory` which uses the
finder to return a ZODB root object.
-#. *Line 18*. We construct a :term:`Configurator` with a :term:`root
+#. *Line 15*. We construct a :term:`Configurator` with a :term:`root
factory` and the settings keywords parsed by PasteDeploy. The root
factory is named ``get_root``.
-#. *Lines 19-21*. Begin configuration using the ``begin`` method of
+#. *Lines 16-18*. Begin configuration using the ``begin`` method of
the :meth:`pyramid.configuration.Configurator` class, load the
``configure.zcml`` file from our package using the
:meth:`pyramid.configuration.Configurator.load_zcml` method, and
end configuration using the
:meth:`pyramid.configuration.Configurator.end` method.
-#. *Line 22*. Use the
+#. *Line 19*. Use the
:meth:`pyramid.configuration.Configurator.make_wsgi_app` method
to return a :term:`WSGI` application.