summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaise Laflamme <blaise@laflamme.org>2012-06-19 20:20:17 -0400
committerBlaise Laflamme <blaise@laflamme.org>2012-06-19 20:20:17 -0400
commit6cea47e9c34841cdf109899e8d965c67af3a5ce9 (patch)
tree13e088100219813d2f1a01dbb3344b216c66c3be
parentea009a6d4a1ffa8585faa85581848f6e74a57dfc (diff)
downloadpyramid-6cea47e9c34841cdf109899e8d965c67af3a5ce9.tar.gz
pyramid-6cea47e9c34841cdf109899e8d965c67af3a5ce9.tar.bz2
pyramid-6cea47e9c34841cdf109899e8d965c67af3a5ce9.zip
fixed typos
-rw-r--r--CHANGES.txt2
-rw-r--r--docs/narr/templates.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 3cb2f2848..1fd92fe19 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 def name and returns the template def
+- The mako renderer now accepts a defname 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 4ac01c96e..5656026ae 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 def named ``bar``, you can configure the template as a
+``foo.mak`` and a defname ``bar``, you can configure the template as a
:term:`renderer` like so:
.. code-block:: python