summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/basiclayout.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-06-10 22:09:12 -0700
committerSteve Piercy <web@stevepiercy.com>2017-06-10 22:09:12 -0700
commit909ae055f2f7391036736ff41a0564becb60478f (patch)
tree8092012891597ea9767b780c2e68575723140128 /docs/tutorials/wiki/basiclayout.rst
parent85623b13b3790dcfae53697f282e9f8e68736e35 (diff)
downloadpyramid-909ae055f2f7391036736ff41a0564becb60478f.tar.gz
pyramid-909ae055f2f7391036736ff41a0564becb60478f.tar.bz2
pyramid-909ae055f2f7391036736ff41a0564becb60478f.zip
synch emphasize-lines with src files for zodb wiki tutorial
Diffstat (limited to 'docs/tutorials/wiki/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki/basiclayout.rst12
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