summaryrefslogtreecommitdiff
path: root/docs/narr/webob.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-04-03 17:37:21 -0400
committerChris McDonough <chrism@plope.com>2013-04-03 17:37:21 -0400
commitd64fa6136d0dec6717b273362de548d8f3bf47e8 (patch)
tree23c77ac62ab9d6c93131874f835ae3166d4af53b /docs/narr/webob.rst
parent2ca9bde9d2862655ddee276cd14a375e6a5adec6 (diff)
parent84e455cf7c8d9cbfe6658548a61af2ecbbc1749e (diff)
downloadpyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.gz
pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.bz2
pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/webob.rst')
-rw-r--r--docs/narr/webob.rst4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 44940f9e6..02c03c8db 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -326,7 +326,6 @@ package that uses SQLAlchemy, and you'd like the current SQLAlchemy database
session to be removed after each request. Put the following in the
``mypackage.__init__`` module:
-.. ignore-next-block
.. code-block:: python
:linenos:
@@ -355,7 +354,7 @@ initialization.
cause ``DBSession.remove`` to be called in an application generated from
any :app:`Pyramid` scaffold, because these all use the ``pyramid_tm``
package. The cleanup done by ``DBSession.remove`` is unnecessary when
- ``pyramid_tm`` middleware is configured into the application.
+ ``pyramid_tm`` :term:`middleware` is configured into the application.
More Details
++++++++++++
@@ -491,7 +490,6 @@ reason for the error. For instance,
:class:`pyramid.Response`, so you can manipulate the instances in the same
way. A typical example is:
-.. ignore-next-block
.. code-block:: python
:linenos: