diff options
| author | Richard Barrell <rchrd@brrll.co.uk> | 2011-11-07 15:42:06 -0800 |
|---|---|---|
| committer | Richard Barrell <rchrd@brrll.co.uk> | 2011-11-07 15:42:06 -0800 |
| commit | a087a7910f2dadab029ba409da9395ecc2b56dfa (patch) | |
| tree | 8489923d74211f26a3c6de02802fa51adc5dec7d /docs/tutorials/wiki | |
| parent | a9e75c453b8ad3abb2ab64f14c3d53637c8ce566 (diff) | |
| parent | 3f13ecd7bbc10ee59c4df980ef6e75aed7c767a6 (diff) | |
| download | pyramid-a087a7910f2dadab029ba409da9395ecc2b56dfa.tar.gz pyramid-a087a7910f2dadab029ba409da9395ecc2b56dfa.tar.bz2 pyramid-a087a7910f2dadab029ba409da9395ecc2b56dfa.zip | |
Merged from master, resolved conflict in CONTRIBUTORS.txt.
Diffstat (limited to 'docs/tutorials/wiki')
| -rw-r--r-- | docs/tutorials/wiki/basiclayout.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index 47cac597b..311352f5b 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -35,7 +35,7 @@ point happens to be the ``main`` function within the file named #. *Line 12*. We construct a :term:`Configurator` with a :term:`root factory` and the settings keywords parsed by :term:`PasteDeploy`. The root - factory is named ``get_root``. + factory is named ``root_factory``. #. *Line 13*. Register a 'static view' which answers requests which start with with URL path ``/static`` using the |