diff options
| author | Michael Merickel <michael@merickel.org> | 2017-06-11 12:34:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 12:34:43 -0500 |
| commit | 06c28384c1217e054f530df511b434ff543e3132 (patch) | |
| tree | 2c88d3fe196a3a594eac3d74f49b20c39d0d7aae /docs/tutorials/wiki/basiclayout.rst | |
| parent | a503511cf82ab1db8c66eb949eeb30da92dd621f (diff) | |
| parent | fa13770dba3947ce78c2a67041cbd02272992104 (diff) | |
| download | pyramid-06c28384c1217e054f530df511b434ff543e3132.tar.gz pyramid-06c28384c1217e054f530df511b434ff543e3132.tar.bz2 pyramid-06c28384c1217e054f530df511b434ff543e3132.zip | |
Merge pull request #3082 from stevepiercy/master
Update docs to synch with cookiecutter updates
Diffstat (limited to 'docs/tutorials/wiki/basiclayout.rst')
| -rw-r--r-- | docs/tutorials/wiki/basiclayout.rst | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index d00eab956..f713d1057 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -41,14 +41,18 @@ Open ``tutorial/__init__.py``. It should already contain the following: factory and the settings keywords parsed by :term:`PasteDeploy`. The root factory is named ``root_factory``. -#. *Line 15*. Include support for the :term:`Chameleon` template rendering +#. *Lines 15 and 16*. Get the settings and use an explicit transaction transaction manager for apps so that they do not implicitly create new transactions when touching the manager outside of the ``pyramid_tm`` lifecycle. + +#. *Line 17*. Include support for the :term:`Chameleon` template rendering bindings, allowing us to use the ``.pt`` templates. -#. *Line 16*. Include support for ``pyramid_tm``, allowing Pyramid requests to join the active transaction as provided by the `transaction <https://pypi.python.org/pypi/transaction>`_ package. +#. *Line 18*. Include support for ``pyramid_tm``, allowing Pyramid requests to join the active transaction as provided by the `transaction <https://pypi.python.org/pypi/transaction>`_ package. + +#. *Line 19*. Include support for ``pyramid_retry`` to retry a request when transient exceptions occur. -#. *Line 17*. Include support for ``pyramid_zodbconn``, providing integration between :term:`ZODB` and a Pyramid application. +#. *Line 20*. Include support for ``pyramid_zodbconn``, providing integration between :term:`ZODB` and a Pyramid application. -#. *Line 18*. Register a "static view", which answers requests whose URL +#. *Line 21*. Register a "static view", which answers requests whose URL paths start with ``/static``, using the :meth:`pyramid.config.Configurator.add_static_view` method. This statement registers a view that will serve up static assets, such as CSS |