diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-07 12:30:55 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-07 12:30:55 -0800 |
| commit | 512982bc876cbab7dc0671c1e807f57d64bf718b (patch) | |
| tree | 62845b570b993c5fab3d2604d0ed8198d76eae35 /docs | |
| parent | b9eac7ede70525b04bc0cf5341e258b92a2edb96 (diff) | |
| parent | 2723b03b611de3512f46c09f8c53ec324cdee7fc (diff) | |
| download | pyramid-512982bc876cbab7dc0671c1e807f57d64bf718b.tar.gz pyramid-512982bc876cbab7dc0671c1e807f57d64bf718b.tar.bz2 pyramid-512982bc876cbab7dc0671c1e807f57d64bf718b.zip | |
resolve conflict
Diffstat (limited to 'docs')
| -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 |