Index: package_branches/invirt-web/cherrypy/code/templates/help.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/help.mako	(revision 2409)
+++ package_branches/invirt-web/cherrypy/code/templates/help.mako	(revision 2409)
@@ -0,0 +1,37 @@
+<%page expression_filter="h"/>
+<%inherit file="skeleton.mako" />
+
+<%!
+	pageclass = 'help'
+%>
+
+<%def name="title()">
+% if len(subjects) == 1:
+Help on ${subjects[0]}
+% else:
+Help
+% endif
+</%def>
+
+% if not simple:
+<p>Topics: 
+% for key in sorted(mapping):
+<a href="help?subject=${key}">${key}</a>
+% endfor
+</p>
+<p>
+See also <a href="trac/wiki/tips">tips and HOWTOs on the wiki</a>.
+</p>
+% endif
+
+% for subject in subjects:
+% if subject in mapping:
+<h2>${subject}</h2>
+<p>${mapping[subject]|n}</p>
+% else:
+<p>Unknown subject '${subject}'.</p>
+% endif
+% endfor
+% if simple:
+<a href="javascript:window.close();">Close</a>
+% endif
Index: package_branches/invirt-web/cherrypy/code/templates/help.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/help.tmpl	(revision 2408)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-#attr pageclass = 'help'
-
-#def title
-#if len($subjects) == 1
-Help on $subjects[0]
-#else
-Help
-#end if
-#end def
-
-
-#def body
-#if not $simple
-<p>Topics: 
-#for $key in sorted($mapping)
-<a href="help?subject=$key">$key</a>
-#end for
-</p>
-<p>
-See also <a href="trac/wiki/tips">tips and HOWTOs on the wiki</a>.
-</p>
-#end if
-#for $subject in $subjects
-#if $subject in $mapping 
-<h2>$subject</h2>
-#filter None
-<p>$mapping[$subject]</p>
-#end filter
-#else
-<p>Unknown subject '$subject'.</p>
-#end if
-#end for
-#if $simple
-<a href="javascript:window.close();">Close</a>
-#end if
-#end def