--- /dev/null
+--- trunk.orig/lib/Maypole/templates/factory/macros
++++ trunk/lib/Maypole/templates/factory/macros
+@@ -14,7 +14,7 @@
+ [%
+ MACRO link(table, command, additional, label) BLOCK;
+ SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional;
+- lnk = lnk | uri ;
++ lnk = lnk | html ;
+ '<a href="' _ lnk _ '">';
+ label | html;
+ "</a>";
+--- trunk.orig/lib/Maypole/templates/factory/header
++++ trunk/lib/Maypole/templates/factory/header
+@@ -10,7 +10,7 @@
+ </title>
+ <meta http-equiv="Content-Type" content="text/html; charset=[% request.document_encoding %]" />
+ <base href="[% config.uri_base%]"/>
+- <link title="Maypole" href="[% config.uri_base %]/maypole.css" type="text/css" rel="stylesheet" />
++ <link title="Maypole" href="[% base %]/maypole.css" type="text/css" rel="stylesheet" />
+ </head>
+ <body>
+ <div class="content">
105_dont-use-warn-method.diff
106_fix-_column_info-clash.diff
107_make-examples-consistent.diff
+108_fix-uris.diff
201_no-file-mmagic-xs.diff