--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -4,14 +4,14 @@
<body>
<div class="buttons">
-<a href="?cl=#rev#">changelog</a>
-<a href="?sl=#rev#">shortlog</a>
-<a href="?tags=">tags</a>
-<a href="?cs=#node|short#">changeset</a>
-<a href="?mf=#node|short#;path=#path|urlescape#">manifest</a>
-<a href="?f=#node|short#;file=#file|urlescape#">file</a>
-<a href="?fl=#node|short#;file=#file|urlescape#">revisions</a>
-<a href="?fa=#node|short#;file=#file|urlescape#;style=raw">raw</a>
+<a href="#url#log/#rev#">changelog</a>
+<a href="#url#shortlog/#rev#">shortlog</a>
+<a href="#url#tags">tags</a>
+<a href="#url#rev/#node|short#">changeset</a>
+<a href="#url#file/#node|short##path|urlescape#">manifest</a>
+<a href="#url#file/#node|short#/#file|urlescape#">file</a>
+<a href="#url#log/#node|short#/#file|urlescape#">revisions</a>
+<a href="#url#raw-annotate/#node|short#/#file|urlescape#">raw</a>
</div>
<h2>Annotate #file|escape#</h2>
@@ -19,7 +19,7 @@
<table>
<tr>
<td class="metatag">changeset #rev#:</td>
- <td><a href="?cs=#node|short#">#node|short#</a></td></tr>
+ <td><a href="#url#rev/#node|short#">#node|short#</a></td></tr>
#rename%filerename#
#parent%fileannotateparent#
#child%fileannotatechild#