summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-11-18 07:03:51 -0500
committerChris McDonough <chrism@plope.com>2013-11-18 07:03:51 -0500
commitc503891d43251e7bf6111c6c1f521b43c55d917b (patch)
tree3028630a1d1e331718e16be26a54d69c56d76b9d /docs/tutorials
parent345694c8eb6dff9ef7375374c5032e53b764c1de (diff)
parentfb15c26a2960d5f7bf598c147f1dd6ad6a062952 (diff)
downloadpyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.gz
pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.bz2
pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.zip
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/authorization.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index 62b1164e3..93cd0c18e 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -149,8 +149,8 @@ to the ``@view_config`` decorator for ``add_page()`` and
``edit_page()``, for example:
.. code-block:: python
- :linenos:
- :emphasize-lines: 3
+ :linenos:
+ :emphasize-lines: 3
@view_config(name='add_page', context='.models.Wiki',
renderer='templates/edit.pt',