summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/basiclayout.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-09 02:50:15 -0500
committerChris McDonough <chrism@plope.com>2010-12-09 02:50:15 -0500
commitf360d9e6d9689dfe92a950e97e7e19c414655997 (patch)
treef0456af418ecfaf7d5a342556d2c5786b2aee979 /docs/tutorials/wiki/basiclayout.rst
parentc18b16d293ee60117747f0de042e2d75361d1fd8 (diff)
parent13173e9e1d1c5f3873e8bfed91e6f3ed561dafaf (diff)
downloadpyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.gz
pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.bz2
pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.zip
Merge branch 'twophase'
Conflicts: pyramid/configuration.py
Diffstat (limited to 'docs/tutorials/wiki/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki/basiclayout.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index a94a1632d..3dbf10bd8 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -50,10 +50,10 @@ entry point happens to be the ``app`` function within the file named
#. *Line 16*. Load the
``configure.zcml`` file from our package using the
- :meth:`pyramid.configuration.Configurator.load_zcml` method.
+ :meth:`pyramid.config.Configurator.load_zcml` method.
#. *Line 17*. Use the
- :meth:`pyramid.configuration.Configurator.make_wsgi_app` method
+ :meth:`pyramid.config.Configurator.make_wsgi_app` method
to return a :term:`WSGI` application.
Configuration With ``configure.zcml``