summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-15 04:17:17 -0400
committerChris McDonough <chrism@plope.com>2012-09-15 04:17:17 -0400
commitdbd108634ff1cafee879b609232d310ce6f056b7 (patch)
tree63518c2bc4b874282d4c3bfca7f0187d1ff1ae34
parentd501b7cb23a26b85882d01deb1c8381acd75447e (diff)
parenta9f5e705bb331098946eef774857511a02e4f498 (diff)
downloadpyramid-dbd108634ff1cafee879b609232d310ce6f056b7.tar.gz
pyramid-dbd108634ff1cafee879b609232d310ce6f056b7.tar.bz2
pyramid-dbd108634ff1cafee879b609232d310ce6f056b7.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--docs/narr/templates.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 9a825c2ab..ba72ebfbf 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -528,7 +528,7 @@ Sommetime you'd like to render a macro inside of a Chameleon ZPT template
instead of the full Chameleon ZPT template. To render the content of a
``define-macro`` field inside a Chameleon ZPT template, given a Chameleon
template file named ``foo.pt`` and a macro named ``bar`` defined within it
-(e.g. ``<div metal:define-macro="bar">...</div>``, you can configure the
+(e.g. ``<div metal:define-macro="bar">...</div>``), you can configure the
template as a :term:`renderer` like so:
.. code-block:: python
@@ -540,8 +540,8 @@ template as a :term:`renderer` like so:
def my_view(request):
return {'project':'my project'}
-The above will render the ``bar`` macro from within the ``foo.pt`` template
-instead of the entire template.
+The above will render only the ``bar`` macro defined within the ``foo.pt``
+template instead of the entire template.
.. note::