5 files changed, 35 insertions, 23 deletions
diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index d41832500..65db987d0 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,8 +1,7 @@
-This is git-annex's bug list, including [[confirmed]], [[unconfirmed]],
-and [[moreinfo]]. Closed bugs are moved to [[done]].
+This is git-annex's bug list. Closed bugs are moved to [[done]].
 
 [[!inline pages="./bugs/* and !./bugs/*/* and !./bugs/done and !link(done) 
-and !./bugs/moreinfo and !./bugs/confirmed and !./bugs/unconfirmed
-and !*/Discussion" actions=yes postform=yes show=0 archive=yes]]
+and !./bugs/moreinfo and !./bugs/confirmed and !*/Discussion"
+actions=yes postform=yes show=0 archive=yes template=buglist]]
 
 [[!edittemplate template=templates/bugtemplate match="bugs/*" silent=yes]]
diff --git a/doc/bugs/confirmed.mdwn b/doc/bugs/confirmed.mdwn
index a32e7568a..1bb3c864f 100644
--- a/doc/bugs/confirmed.mdwn
+++ b/doc/bugs/confirmed.mdwn
@@ -1,8 +1,5 @@
-These bug reports have been confirmed to be real bugs, and so are likely
+This tag is for bugs that have been confirmed to be real bugs, and so are likely
 to be the next bugs fixed.
 
-If your bug report is not listed here, you probably need to provide more
-information so that the bug can be reproduced. See also: [[unconfirmed]]
-
-[[!inline pages="./* and link(./confirmed) and !link(./done) and !./unconfirmed" show=0
-archive=yes]]
+If your bug report is not tagged as confirmed, you probably need to provide more
+information so that the bug can be reproduced.
diff --git a/doc/bugs/moreinfo.mdwn b/doc/bugs/moreinfo.mdwn
index 9c162b1d5..579707dab 100644
--- a/doc/bugs/moreinfo.mdwn
+++ b/doc/bugs/moreinfo.mdwn
@@ -1,6 +1,2 @@
-If your bug report is listed here, it has been flagged as needing more
-information. Please respond to the bug and provide the requested
-information.
-
-[[!inline pages="./* and link(./moreinfo) and !link(./done) and !*/Discussion" sort=mtime show=0
-archive=yes]]
+This tags is for bugs needing more information from their submitter.
+Please respond to the bug and provide the requested information.
diff --git a/doc/bugs/unconfirmed.mdwn b/doc/bugs/unconfirmed.mdwn
deleted file mode 100644
index 335703c12..000000000
--- a/doc/bugs/unconfirmed.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-These bug reports have not yet been [[confirmed]] by the git-annex developers
-to be actually bugs in git-annex, rather than some other problem.
-
-See also: [[moreinfo]]
-
-[[!inline pages="./* and !link(./confirmed) and !link(./moreinfo) and !link(./done) and !./done and !./confirmed" show=0
-archive=yes]]
diff --git a/doc/templates/buglist.tmpl b/doc/templates/buglist.tmpl
new file mode 100644
index 000000000..1121d89f5
--- /dev/null
+++ b/doc/templates/buglist.tmpl
@@ -0,0 +1,27 @@
+<div class="archivepage">
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
+<span class="archivepagedate">
+Posted <TMPL_VAR CTIME>
+<TMPL_IF AUTHOR>
+by <span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+</span>
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
+Tagged:
+<TMPL_LOOP TAGS>
+<TMPL_VAR LINK>
+</TMPL_LOOP>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
+</TMPL_IF>
+</div>