--- a/doc/templates.txt
+++ b/doc/templates.txt
@@ -29,10 +29,11 @@
 
 A Genshi *markup template* is a well-formed XML document with embedded Python
 used for control flow and variable substitution. Markup templates should be
-used to generate any kind of HTML or XML output, as they provide many advantages
-over simple text-based templates (such as automatic escaping of strings).
+used to generate any kind of HTML or XML output, as they provide a number of
+advantages over simple text-based templates (such as automatic escaping of
+variable data).
 
-The following illustrates a very basic Genshi markup template:
+The following is a simple Genshi markup template:
 
 .. code-block:: genshi
 
@@ -57,7 +58,7 @@
 
 This example shows:
 
-(a) a Python code block, using a processing instruction
+(a) a Python code block in a processing instruction
 (b) the Genshi namespace declaration
 (c) usage of templates directives (``py:content`` and ``py:for``)
 (d) an inline Python expression (``${fruit}``).
@@ -81,9 +82,10 @@
     </body>
   </html>
 
-A *text template* is a simple plain text document that can also contain embedded
-Python code. Text templates can be used to generate simple *non-markup* text
-formats, such as the body of an plain text email. For example:
+A *text template* is a simple plain text document that can also contain
+embedded Python code. Text templates are intended to be used for simple
+*non-markup* text formats, such as the body of an plain text email. For
+example:
 
 .. code-block:: genshitext
 
@@ -116,7 +118,7 @@
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<h1>Hello, $name!</h1>')
   >>> stream = tmpl.generate(name='world')
-  >>> print stream.render('xhtml')
+  >>> print(stream.render('xhtml'))
   <h1>Hello, world!</h1>
 
 .. note:: See the Serialization_ section of the `Markup Streams`_ page for
@@ -129,7 +131,7 @@
   >>> from genshi.template import TextTemplate
   >>> tmpl = TextTemplate('Hello, $name!')
   >>> stream = tmpl.generate(name='world')
-  >>> print stream
+  >>> print(stream)
   Hello, world!
 
 .. note:: If you want to use text templates, you should consider using the
@@ -140,7 +142,7 @@
 .. _`Text Template Language`: text-templates.html
 .. _`Markup Streams`: streams.html
 
-Using a template loader provides the advantage that “compiled” templates are
+Using a `template loader`_ provides the advantage that “compiled” templates are
 automatically cached, and only parsed again when the template file changes. In
 addition, it enables the use of a *template search path*, allowing template
 directories to be spread across different file-system locations. Using a
@@ -152,11 +154,12 @@
   loader = TemplateLoader([templates_dir1, templates_dir2])
   tmpl = loader.load('test.html')
   stream = tmpl.generate(title='Hello, world!')
-  print stream.render()
+  print(stream.render())
 
 See the `API documentation <api/index.html>`_ for details on using Genshi via
 the Python API.
 
+.. _`template loader`: loader.html
 
 .. _`expressions`:
 
@@ -181,7 +184,7 @@
 
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<em>${items[0].capitalize()} item</em>')
-  >>> print tmpl.generate(items=['first', 'second'])
+  >>> print(tmpl.generate(items=['first', 'second']))
   <em>First item</em>
 
 Expressions support the full power of Python. In addition, it is possible to
@@ -193,7 +196,7 @@
 
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<em>${dict.foo}</em>')
-  >>> print tmpl.generate(dict={'foo': 'bar'})
+  >>> print(tmpl.generate(dict={'foo': 'bar'}))
   <em>bar</em>
 
 Because there are two ways to access either attributes or items, expressions
@@ -213,12 +216,12 @@
 
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<em>$foo</em>') # Wanted "$foo" as literal output
-  >>> print tmpl.generate()
+  >>> print(tmpl.generate())
   Traceback (most recent call last):
     ...
   UndefinedError: "foo" not defined
   >>> tmpl = MarkupTemplate('<em>$$foo</em>')
-  >>> print tmpl.generate()
+  >>> print(tmpl.generate())
   <em>$foo</em>
 
 But note that this is not necessary if the characters following the dollar sign
@@ -227,7 +230,7 @@
 .. code-block:: pycon
 
   >>> tmpl = MarkupTemplate('<script>$(function() {})</script>')
-  >>> print tmpl.generate()
+  >>> print(tmpl.generate())
   <script>$(function() {})</script>
 
 On the other hand, Genshi will always replace two dollar signs in text with a
@@ -237,7 +240,7 @@
 .. code-block:: pycon
 
   >>> tmpl = MarkupTemplate('<script>$$$("div")</script>')
-  >>> print tmpl.generate()
+  >>> print(tmpl.generate())
   <script>$$("div")</script>
 
 
@@ -338,7 +341,7 @@
 
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<p>${defined("doh")}</p>')
-  >>> print tmpl.generate().render('xhtml')
+  >>> print(tmpl.generate().render('xhtml'))
   <p>False</p>
 
 .. note:: Lenient error handling was the default in Genshi prior to version 0.5.
@@ -364,7 +367,7 @@
 
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<p>${doh}</p>', lookup='lenient')
-  >>> print tmpl.generate().render('xhtml')
+  >>> print(tmpl.generate().render('xhtml'))
   <p></p>
 
 You *will* however get an exception if you try to call an undefined variable, or
@@ -374,7 +377,7 @@
 
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<p>${doh.oops}</p>', lookup='lenient')
-  >>> print tmpl.generate().render('xhtml')
+  >>> print(tmpl.generate().render('xhtml'))
   Traceback (most recent call last):
     ...
   UndefinedError: "doh" not defined
@@ -387,7 +390,7 @@
   >>> from genshi.template import MarkupTemplate
   >>> tmpl = MarkupTemplate('<p>${type(doh) is not Undefined}</p>',
   ...                       lookup='lenient')
-  >>> print tmpl.generate().render('xhtml')
+  >>> print(tmpl.generate().render('xhtml'))
   <p>False</p>
 
 Alternatively, the built-in functions defined_ or value_of_ can be used in this