summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-07 16:44:43 -0500
committerChris McDonough <chrism@plope.com>2010-11-07 16:44:43 -0500
commit0476846873e55a5d5f43a7d0ee0a83a260788264 (patch)
treef2eb384bac5d402138fcc8dcd726e6c28d29fd95 /docs
parent8ff65d19d0f998df1e05abfae9ff7613ec7ea816 (diff)
parentd85611781f67ec91535ecc9663808814f0b38519 (diff)
downloadpyramid-0476846873e55a5d5f43a7d0ee0a83a260788264.tar.gz
pyramid-0476846873e55a5d5f43a7d0ee0a83a260788264.tar.bz2
pyramid-0476846873e55a5d5f43a7d0ee0a83a260788264.zip
Merge branch 'mgedmin-master'
Diffstat (limited to 'docs')
-rw-r--r--docs/tutorials/wiki2/definingviews.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index ea4ca3bab..0826de660 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -297,7 +297,7 @@ something like so:
.. literalinclude:: src/views/tutorial/__init__.py
:linenos:
- :language: xml
+ :language: python
The WSGI Pipeline
-----------------