summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
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/narr/introduction.rst
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/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index a9c5fdfbd..8acbab3a0 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -336,7 +336,7 @@ For example, instead of returning a ``Response`` object from a
``render_to_response`` call:
.. code-block:: python
- :linenos:
+ :linenos:
from pyramid.renderers import render_to_response
@@ -347,7 +347,7 @@ For example, instead of returning a ``Response`` object from a
You can return a Python dictionary:
.. code-block:: python
- :linenos:
+ :linenos:
from pyramid.view import view_config
@@ -827,7 +827,7 @@ Here's an example of using Pyramid's introspector from within a view
callable:
.. code-block:: python
- :linenos:
+ :linenos:
from pyramid.view import view_config
from pyramid.response import Response