summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/basiclayout.rst
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-11-19 23:25:44 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-11-19 23:25:44 -0700
commitb6f6e5506fa51a79eb5b0bb3c95b01878526fbff (patch)
tree277dbc6019c7f5b0f2cb1b35074186e247f526a8 /docs/tutorials/wiki/basiclayout.rst
parent673d55a3188d88c5fcf66062a894818a66722334 (diff)
parentdd53294c3342f58e0fb62b20ad61e59c1f88ac8b (diff)
downloadpyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.tar.gz
pyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.tar.bz2
pyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.zip
merge changes from master
Diffstat (limited to 'docs/tutorials/wiki/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki/basiclayout.rst9
1 files changed, 3 insertions, 6 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index c05a53831..a94a1632d 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -48,14 +48,11 @@ entry point happens to be the ``app`` function within the file named
factory` and the settings keywords parsed by PasteDeploy. The root
factory is named ``get_root``.
-#. *Lines 16-18*. Begin configuration using the ``begin`` method of
- the :meth:`pyramid.configuration.Configurator` class, load the
+#. *Line 16*. 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.
+ :meth:`pyramid.configuration.Configurator.load_zcml` method.
-#. *Line 19*. Use the
+#. *Line 17*. Use the
:meth:`pyramid.configuration.Configurator.make_wsgi_app` method
to return a :term:`WSGI` application.