From 909ae055f2f7391036736ff41a0564becb60478f Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 11 Jun 2017 07:09:12 +0200
Subject: [PATCH] synch emphasize-lines with src files for zodb wiki tutorial
---
docs/tutorials/wiki/authorization.rst | 8 ++++----
docs/tutorials/wiki/definingviews.rst | 2 +-
docs/tutorials/wiki/installation.rst | 4 ++--
docs/tutorials/wiki/basiclayout.rst | 12 ++++++++----
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index 0ba734f..211d69f 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -49,7 +49,7 @@
.. literalinclude:: src/authorization/setup.py
:linenos:
- :emphasize-lines: 21
+ :emphasize-lines: 23
:language: python
Only the highlighted line needs to be added.
@@ -155,9 +155,9 @@
Now add those policies to the configuration:
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 18-23
+ :lines: 18-25
:lineno-match:
- :emphasize-lines: 1-3,5-6
+ :emphasize-lines: 1-3,7-9
:language: python
Only the highlighted lines need to be added.
@@ -327,7 +327,7 @@
.. literalinclude:: src/authorization/tutorial/__init__.py
:linenos:
- :emphasize-lines: 4-5,8,18-20,22-23
+ :emphasize-lines: 4-5,8,18-20,24-25
:language: python
Only the highlighted lines need to be added or edited.
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index d00eab9..f713d10 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -41,14 +41,18 @@
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 17*. Include support for ``pyramid_zodbconn``, providing integration between :term:`ZODB` and a Pyramid application.
+#. *Line 19*. Include support for ``pyramid_retry`` to retry a request when transient exceptions occur.
-#. *Line 18*. Register a "static view", which answers requests whose URL
+#. *Line 20*. Include support for ``pyramid_zodbconn``, providing integration between :term:`ZODB` and a Pyramid application.
+
+#. *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
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 442d5ed..f4ca9b8 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -47,7 +47,7 @@
.. literalinclude:: src/views/setup.py
:linenos:
- :emphasize-lines: 20
+ :emphasize-lines: 22
:language: python
Only the highlighted line needs to be added.
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 3e7434b..e9a93f9 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -180,12 +180,12 @@
.. literalinclude:: src/installation/setup.py
:language: python
:lineno-match:
- :lines: 22-26
+ :lines: 24-28
.. literalinclude:: src/installation/setup.py
:language: python
:lineno-match:
- :lines: 46-48
+ :lines: 48-50
.. _running_tests:
--
Gitblit v1.9.3