From efcf8f1c8b1e1140a5e9d9bb6fea558150ae7c29 Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Sat, 3 Aug 2013 11:34:05 -0400
Subject: Some more occurrences of "application framework".

---
 docs/narr/templates.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/narr/templates.rst')

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index d4cf20b93..f1e1634b8 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -711,7 +711,7 @@ look like:
          <h1 class="title">Welcome to <code>${project}</code>, an
 	  application generated by the <a
 	  href="http://docs.pylonsproject.org/projects/pyramid/current/"
-         >pyramid</a> web application framework.</h1>
+         >pyramid</a> web framework.</h1>
       </body>
     </html>
 
-- 
cgit v1.2.3


From 7683e22a93a3df2a541dddb9afac540ef9094f49 Mon Sep 17 00:00:00 2001
From: Jeff Szusz <jeff.szusz@gmail.com>
Date: Mon, 12 Aug 2013 11:10:09 -0400
Subject: #967 fixed 'Sommetime' -> 'Sometime' in templates.rst

---
 docs/narr/templates.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/narr/templates.rst')

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index d4cf20b93..ddebb3fa2 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -723,7 +723,7 @@ This template doesn't use any advanced features of Mako, only the
 Using A Mako def name Within a Renderer Name
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Sommetime you'd like to render a ``def`` inside of a Mako template instead of
+Sometime you'd like to render a ``def`` inside of a Mako template instead of
 the full Mako template. To render 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 :term:`renderer` like so:
-- 
cgit v1.2.3


From fc9d4cbc8b3ccbd2c2b5c942595bf420eeae4596 Mon Sep 17 00:00:00 2001
From: Jeff Szusz <jeff.szusz@gmail.com>
Date: Mon, 12 Aug 2013 11:28:53 -0400
Subject: Update templates.rst

---
 docs/narr/templates.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/narr/templates.rst')

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index ddebb3fa2..af5ad6c5c 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -723,7 +723,7 @@ This template doesn't use any advanced features of Mako, only the
 Using A Mako def name Within a Renderer Name
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Sometime you'd like to render a ``def`` inside of a Mako template instead of
+Sometimes you'd like to render a ``def`` inside of a Mako template instead of
 the full Mako template. To render 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 :term:`renderer` like so:
-- 
cgit v1.2.3


From 49d634bd813e63c3db5e56d29376126c2646182a Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Mon, 12 Aug 2013 19:29:23 -0400
Subject: All wrapped up, pre-merge.

---
 docs/narr/templates.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/narr/templates.rst')

diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index f1e1634b8..a70398c80 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -616,6 +616,8 @@ extension so that these ``svn:ignore`` patterns work.
 .. index::
    pair: debugging; templates
 
+.. _debugging_templates:
+
 Debugging Templates
 -------------------
 
-- 
cgit v1.2.3