diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
| commit | 88fba8dbd201118241965d6a056ae09372b0630c (patch) | |
| tree | e0c30696df5827037048eb0cdd6c0731653a1734 /docs/narr/templates.rst | |
| parent | ce0e371e067f3628620a7db5a50056c9a045979f (diff) | |
| parent | 291995fa17ae55adfda09c4eda095fd5e8cb21d8 (diff) | |
| download | pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.gz pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.bz2 pyramid-88fba8dbd201118241965d6a056ae09372b0630c.zip | |
fix conflicts
Diffstat (limited to 'docs/narr/templates.rst')
| -rw-r--r-- | docs/narr/templates.rst | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst index 5481a971b..a9cdc13fb 100644 --- a/docs/narr/templates.rst +++ b/docs/narr/templates.rst @@ -734,12 +734,8 @@ look like: .. code-block:: xml :linenos: - <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:tal="http://xml.zope.org/namespaces/tal"> + <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <title>${project} Application</title> </head> <body> @@ -751,7 +747,7 @@ look like: </html> This template doesn't use any advanced features of Mako, only the -``${squiggly}`` replacement syntax for names that are passed in as +``${}`` replacement syntax for names that are passed in as :term:`renderer globals`. See the `the Mako documentation <http://www.makotemplates.org/>`_ to use more advanced features. |