diff --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl
--- a/templates/changelogentry.tmpl
+++ b/templates/changelogentry.tmpl
@@ -4,13 +4,13 @@
  <td align="right" width="15%"><b>#age# ago:&nbsp;</b></td>
  <td><b>#shortdesc#</b></td</tr>
 <tr>
- <td align="right">revision:&nbsp;</td>
- <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
+ <td align="right">changeset #rev#:&nbsp;</td>
+ <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
 #parent1#
 #parent2#
 <tr>
  <td align="right">manifest:&nbsp;</td>
- <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr>
+ <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr>
 <tr>
  <td align="right">author:&nbsp;</td>
  <td>#author#</td></tr>
diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl
--- a/templates/changeset.tmpl
+++ b/templates/changeset.tmpl
@@ -12,13 +12,13 @@
 
 <table>
 <tr>
- <td class="metatag">revision:</td>
- <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
+ <td class="metatag">changeset #rev#:</td>
+ <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
 #parent1#
 #parent2#
 <tr>
  <td class="metatag">manifest:</td>
- <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr>
+ <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr>
 <tr>
  <td class="metatag">author:</td>
  <td>#author#</td></tr>
diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl
--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -15,13 +15,13 @@
 
 <table>
 <tr>
- <td class="metatag">changeset:</td>
- <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
+ <td class="metatag">changeset #rev#:</td>
+ <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
 #parent1#
 #parent2#
 <tr>
  <td class="metatag">manifest:</td>
- <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr>
+ <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr>
 <tr>
  <td class="metatag">author:</td>
  <td>#author#</td></tr>
diff --git a/templates/filediff.tmpl b/templates/filediff.tmpl
--- a/templates/filediff.tmpl
+++ b/templates/filediff.tmpl
@@ -15,11 +15,11 @@
 
 <table>
 <tr>
- <td class="metatag">revision:</td>
- <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
+ <td class="metatag">revision #rev#:</td>
+ <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
 <tr>
- <td class="metatag">parent:</td>
- <td><a href="?cmd=changeset;node=#p1#">#p1rev#:#p1#</a></td></tr>
+ <td class="metatag">parent #p1rev#:</td>
+ <td><a href="?cmd=changeset;node=#p1#">#p1#</a></td></tr>
 </table>
 
 <pre class="parity0">
diff --git a/templates/filelogentry.tmpl b/templates/filelogentry.tmpl
--- a/templates/filelogentry.tmpl
+++ b/templates/filelogentry.tmpl
@@ -3,8 +3,8 @@
  <td align="right" width="15%"><b>#age# ago:&nbsp;</b></td>
  <td><b><a href="?cmd=changeset;node=#node#">#shortdesc#</a></b></td</tr>
 <tr>
- <td align="right">revision:&nbsp;</td>
- <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filerev#:#filenode#</a>
+ <td align="right">revision #filerev#:&nbsp;</td>
+ <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode#</a>
 <a href="?cmd=filediff;file=#file#;node=#node#">(diff)</a>
 <a href="?cmd=annotate;file=#file#;filenode=#filenode#">(annotate)</a>
 </td></tr>
diff --git a/templates/filerevision.tmpl b/templates/filerevision.tmpl
--- a/templates/filerevision.tmpl
+++ b/templates/filerevision.tmpl
@@ -15,13 +15,13 @@
 
 <table>
 <tr>
- <td class="metatag">changeset:</td>
- <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
+ <td class="metatag">changeset #rev#:</td>
+ <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
 #parent1#
 #parent2#
 <tr>
  <td class="metatag">manifest:</td>
- <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr>
+ <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr>
 <tr>
  <td class="metatag">author:</td>
  <td>#author#</td></tr>
diff --git a/templates/map b/templates/map
--- a/templates/map
+++ b/templates/map
@@ -21,7 +21,7 @@ difflineplus = "<span class="plusline">#
 difflineminus = "<span class="minusline">#line#</span>"
 difflineat = "<span class="atline">#line#</span>"
 diffline = "#line#"
-changelogparent = "<tr><td align="right">parent:&nbsp;</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"
-changesetparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"
-filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#rev#:#node#</a></td></tr>"
-fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#rev#:#node#</a></td></tr>"
+changelogparent = "<tr><td align="right">parent:&nbsp;</td><td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>"
+changesetparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>"
+filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node#</a></td></tr>"
+fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node#</a></td></tr>"