summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaise Laflamme <blaise@laflamme.org>2012-06-19 20:22:34 -0400
committerBlaise Laflamme <blaise@laflamme.org>2012-06-19 20:22:34 -0400
commitc2d65ff71dac6a9b15119db8c2fb09884f4060e3 (patch)
tree23760cfe4cf86ea1a7d754a8826c5489f3cae5f8
parent6cea47e9c34841cdf109899e8d965c67af3a5ce9 (diff)
downloadpyramid-c2d65ff71dac6a9b15119db8c2fb09884f4060e3.tar.gz
pyramid-c2d65ff71dac6a9b15119db8c2fb09884f4060e3.tar.bz2
pyramid-c2d65ff71dac6a9b15119db8c2fb09884f4060e3.zip
fixed typos
-rw-r--r--CHANGES.txt2
-rw-r--r--docs/narr/templates.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 1fd92fe19..3cb2f2848 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -42,7 +42,7 @@ Features
and ``HTTPMovedPermanently`` exceptions, so these can be caught by the
NotFound view (and other exception views).
-- The mako renderer now accepts a defname and returns the template def
+- The mako renderer now accepts a def name and returns the template def
result for the view being called. The uri format using an asset spec is
package:path/to/template#defname.mako. The old way of returning a tuple
from the view is supported for backward compatibility, ('defname', {}).
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 5656026ae..860010a1a 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -718,7 +718,7 @@ Using def inside Mako Templates
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To use a def inside a Mako template, given a :term:`Mako` template file named
-``foo.mak`` and a defname ``bar``, you can configure the template as a
+``foo.mak`` and a def named ``bar``, you can configure the template as a
:term:`renderer` like so:
.. code-block:: python
@@ -726,7 +726,7 @@ To use a def inside a Mako template, given a :term:`Mako` template file named
from pyramid.view import view_config
- @view_config(renderer='foo#defname.mak')
+ @view_config(renderer='foo#bar.mak')
def my_view(request):
return {'project':'my project'}