Recent changes to this wiki:

creating tag page tags/qmail
diff --git a/tags/qmail.mdwn b/tags/qmail.mdwn
new file mode 100644
index 0000000..ea85563
--- /dev/null
+++ b/tags/qmail.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged qmail"]]
+
+[[!inline pages="tagged(qmail)" actions="no" archive="yes"
+feedshow=10]]

add djb blog
diff --git a/feeds.mdwn b/feeds.mdwn
index cec19bc..5b186ae 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -24,6 +24,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Chip Salzenberg" tag="perl" url="http://use.perl.org/~chip/journal" feedurl="http://use.perl.org/~chip/journal/rss" expirecount=10]]
 * [[!aggregate name="Damien Sandras" tag="ekiga" url="http://blog.ekiga.net/" feedurl="http://blog.ekiga.net/?feed=rss2" expirecount=10]]
 * [[!aggregate name="Dan Williams" tag="network-manager" url="http://blogs.gnome.org/dcbw/" feedurl="http://blogs.gnome.org/dcbw/feed/atom/" expirecount=10]]
+* [[!aggregate name="Daniel Bernstein" tag="qmail" url="https://blog.cr.yp.to/index.html" feedurl="https://blog.cr.yp.to/feed.application=xml" expirecount=10]]
 * [[!aggregate name="Dave Jones" tag="linux" url="http://kernelslacker.livejournal.com/" feedurl="http://kernelslacker.livejournal.com/data/atom" expirecount=10]]
 * [[!aggregate name="David Miller" tag="linux" url="http://vger.kernel.org/~davem/cgi-bin/blog.cgi" feedurl="http://vger.kernel.org/~davem/cgi-bin/blog.cgi/index.rss" expirecount=10]]
 * [[!aggregate name="Egon Willighagen" tag="libcdk-java" url="http://chem-bla-ics.blogspot.com/" feedurl="http://chem-bla-ics.blogspot.com/feeds/posts/default/-/CDK?alt=rss" expirecount=10]]

creating tag page tags/person
diff --git a/tags/person.mdwn b/tags/person.mdwn
new file mode 100644
index 0000000..d3b7dfa
--- /dev/null
+++ b/tags/person.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged person"]]
+
+[[!inline pages="tagged(person)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/systemd
diff --git a/tags/systemd.mdwn b/tags/systemd.mdwn
new file mode 100644
index 0000000..62a1852
--- /dev/null
+++ b/tags/systemd.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged systemd"]]
+
+[[!inline pages="tagged(systemd)" actions="no" archive="yes"
+feedshow=10]]

add tag
diff --git a/feeds.mdwn b/feeds.mdwn
index 142a685..cec19bc 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -47,7 +47,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Michael Tiemann" tag="gcc" url="http://www.opensource.org/blog/8" feedurl="http://www.opensource.org/blog/8/feed" expirecount=10]]
 * [[!aggregate name="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" expirecount=10]]
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/8/planets/" expirecount=10]]
-* [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
+* [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" tag="systemd" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Paul Vixie" tag="bind" feedurl="http://www.redbarn.org/blog/1/feed" url="http://www.redbarn.org/blogs/vixie" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]

move
diff --git a/feeds.mdwn b/feeds.mdwn
index 8945e79..142a685 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -57,6 +57,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Robert Love" tag="linux" url="http://blog.rlove.org/" feedurl="http://blog.rlove.org/feeds/posts/default?alt=rss" expirecount=10]]
 * [[!aggregate name="Rod Whitby" tag="nslu2" url="http://www.rwhitby.net/" feedurl="http://www.rwhitby.net/rss" expirecount=10]]
 * [[!aggregate name="Stuart Parmenter" tag="firefox" url="http://blog.pavlov.net/" feedurl="http://blog.pavlov.net/feed/atom/" expirecount=10]]
-* [[!aggregate name="Ulrich Drepper" tag="glibc" url="http://www.livejournal.com/users/udrepper/" feedurl="http://www.livejournal.com/users/udrepper/data/rss" expirecount=10]]
+* [[!aggregate name="Ulrich Drepper" tag="glibc" url="http://www.akkadia.org/drepper/blog/" feedurl="http://www.akkadia.org/drepper/blog/rss" expirecount=10]]
 
 

more specific link for vixie's blog, omitting other people
diff --git a/feeds.mdwn b/feeds.mdwn
index fced67f..8945e79 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -49,7 +49,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/8/planets/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
-* [[!aggregate name="Paul Vixie" tag="bind" feedurl="http://www.redbarn.org/rss.xml" url="http://www.redbarn.org/" expirecount=10]]
+* [[!aggregate name="Paul Vixie" tag="bind" feedurl="http://www.redbarn.org/blog/1/feed" url="http://www.redbarn.org/blogs/vixie" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]
 * [[!aggregate name="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]
 * [[!aggregate name="Rusty Russell" tag="linux" feedurl="http://rusty.ozlabs.org/?feed=rss2" url="http://rusty.ozlabs.org/" expirecount=10]]

attempt to keep existing feed cache
diff --git a/feeds.mdwn b/feeds.mdwn
index 3bc9732..fced67f 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -32,7 +32,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Greg Kroah-Hartman" tag="linux" url="http://www.kroah.com/log/" feedurl="http://www.kroah.com/log/index.rss" expirecount=10]]
 * [[!aggregate name="Guido van Rossum" tag="python" url="http://neopythonic.blogspot.com/" feedurl="http://neopythonic.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
-* [[!aggregate name="Jannis Pohlmann" tag="xfce" url="http://gezeiten.org/" feedurl="http://gezeiten.org/feed/atom" expirecount=10]]
+* [[!aggregate name="Jannis Pohlmann" tag="xfce" url="http://gezeiten.org/" feedurl="http://gezeiten.org/feed/atom" dir="Jannis_Pohlman" expirecount=10]]
 * [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://www.jwz.org/blog/" feedurl="http://www.jwz.org/blog/feed/" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]
 * [[!aggregate name="Jim Gettys" tag="xorg" url="https://gettys.wordpress.com/" feedurl="https://gettys.wordpress.com/feed/" expirecount=10]]

"Pohlmann" hat zwei mal 'n' (AUTHOR != NAME, made visible by my local ikiwiki planet changes)
diff --git a/feeds.mdwn b/feeds.mdwn
index bf2b461..3bc9732 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -32,7 +32,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Greg Kroah-Hartman" tag="linux" url="http://www.kroah.com/log/" feedurl="http://www.kroah.com/log/index.rss" expirecount=10]]
 * [[!aggregate name="Guido van Rossum" tag="python" url="http://neopythonic.blogspot.com/" feedurl="http://neopythonic.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
-* [[!aggregate name="Jannis Pohlman" tag="xfce" url="http://gezeiten.org/" feedurl="http://gezeiten.org/feed/atom" expirecount=10]]
+* [[!aggregate name="Jannis Pohlmann" tag="xfce" url="http://gezeiten.org/" feedurl="http://gezeiten.org/feed/atom" expirecount=10]]
 * [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://www.jwz.org/blog/" feedurl="http://www.jwz.org/blog/feed/" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]
 * [[!aggregate name="Jim Gettys" tag="xorg" url="https://gettys.wordpress.com/" feedurl="https://gettys.wordpress.com/feed/" expirecount=10]]

creating tag page tags/bind
diff --git a/tags/bind.mdwn b/tags/bind.mdwn
new file mode 100644
index 0000000..0c09963
--- /dev/null
+++ b/tags/bind.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged bind"]]
+
+[[!inline pages="tagged(bind)" actions="no" archive="yes"
+feedshow=10]]

vixie moved
diff --git a/feeds.mdwn b/feeds.mdwn
index 995b902..bf2b461 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -49,7 +49,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/8/planets/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
-* [[!aggregate name="Paul Vixie" tag="bind" feedurl="http://www.isc.org/blogs/12/rss.xml" url="http://www.isc.org/blog/12/" expirecount=10]]
+* [[!aggregate name="Paul Vixie" tag="bind" feedurl="http://www.redbarn.org/rss.xml" url="http://www.redbarn.org/" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]
 * [[!aggregate name="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]
 * [[!aggregate name="Rusty Russell" tag="linux" feedurl="http://rusty.ozlabs.org/?feed=rss2" url="http://rusty.ozlabs.org/" expirecount=10]]

add vixie
diff --git a/feeds.mdwn b/feeds.mdwn
index f456843..995b902 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -49,6 +49,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/8/planets/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
+* [[!aggregate name="Paul Vixie" tag="bind" feedurl="http://www.isc.org/blogs/12/rss.xml" url="http://www.isc.org/blog/12/" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]
 * [[!aggregate name="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]
 * [[!aggregate name="Rusty Russell" tag="linux" feedurl="http://rusty.ozlabs.org/?feed=rss2" url="http://rusty.ozlabs.org/" expirecount=10]]

add Rusty
diff --git a/feeds.mdwn b/feeds.mdwn
index ae80fc0..f456843 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -51,6 +51,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]
 * [[!aggregate name="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]
+* [[!aggregate name="Rusty Russell" tag="linux" feedurl="http://rusty.ozlabs.org/?feed=rss2" url="http://rusty.ozlabs.org/" expirecount=10]]
 * [[!aggregate name="Richard Stallman" tag="gnu" feedurl="http://www.stallman.org/rss/rss.xml" url="http://www.stallman.org/" expirecount=10]]
 * [[!aggregate name="Robert Love" tag="linux" url="http://blog.rlove.org/" feedurl="http://blog.rlove.org/feeds/posts/default?alt=rss" expirecount=10]]
 * [[!aggregate name="Rod Whitby" tag="nslu2" url="http://www.rwhitby.net/" feedurl="http://www.rwhitby.net/rss" expirecount=10]]

bram moved
diff --git a/feeds.mdwn b/feeds.mdwn
index c6f3976..ae80fc0 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -19,7 +19,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Ben Laurie" tag="openssl" url="http://www.links.org/" feedurl="http://www.links.org/?feed=rss2" expirecount=10]]
 * [[!aggregate name="Benjamin Otte" tag="swf-player" tag="swfdec" url="http://www.advogato.org/person/company/" feedurl="http://www.advogato.org/person/company/rss.xml" expirecount=10]]
 * [[!aggregate name="Bradley M. Kuhn" tag="AGPL" url="http://ebb.org/bkuhn/blog/" feedurl="http://ebb.org/bkuhn/blog/rss.xml" expirecount=10]]
-* [[!aggregate name="Bram Cohen" tag="bittorrent" url="http://www.livejournal.com/users/bramcohen/" feedurl="http://www.livejournal.com/users/bramcohen/data/rss" expirecount=10]]
+* [[!aggregate name="Bram Cohen" tag="bittorrent" url="http://bramcohen.com/" feedurl="http://bramcohen.com/feed" expirecount=10]]
 * [[!aggregate name="Bruce Perens" tag="busybox" url="http://perens.com/blog/" feedurl="http://perens.com/blog/rss.xml" expirecount=10]]
 * [[!aggregate name="Chip Salzenberg" tag="perl" url="http://use.perl.org/~chip/journal" feedurl="http://use.perl.org/~chip/journal/rss" expirecount=10]]
 * [[!aggregate name="Damien Sandras" tag="ekiga" url="http://blog.ekiga.net/" feedurl="http://blog.ekiga.net/?feed=rss2" expirecount=10]]

Update my blog feed
diff --git a/feeds.mdwn b/feeds.mdwn
index dac84fc..c6f3976 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -46,7 +46,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Martin Pool" tag="bazaar" tag="distcc" url="http://sourcefrog.net/weblog" feedurl="http://sourcefrog.net/weblog/index.rss" expirecount=10]]
 * [[!aggregate name="Michael Tiemann" tag="gcc" url="http://www.opensource.org/blog/8" feedurl="http://www.opensource.org/blog/8/feed" expirecount=10]]
 * [[!aggregate name="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" expirecount=10]]
-* [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/11/planet-debian/" expirecount=10]]
+* [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/8/planets/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]

Update my blog feed
diff --git a/feeds.mdwn b/feeds.mdwn
index b50acb4..dac84fc 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -46,7 +46,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Martin Pool" tag="bazaar" tag="distcc" url="http://sourcefrog.net/weblog" feedurl="http://sourcefrog.net/weblog/index.rss" expirecount=10]]
 * [[!aggregate name="Michael Tiemann" tag="gcc" url="http://www.opensource.org/blog/8" feedurl="http://www.opensource.org/blog/8/feed" expirecount=10]]
 * [[!aggregate name="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" expirecount=10]]
-* [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://www.mukund.org/" feedurl="https://www.mukund.org/index.rss" expirecount=10]]
+* [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://banu.com/blog/" feedurl="https://banu.com/blog/feed/11/planet-debian/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]

creating tag page tags/libcdk-java
diff --git a/tags/libcdk-java.mdwn b/tags/libcdk-java.mdwn
new file mode 100644
index 0000000..df4d1e1
--- /dev/null
+++ b/tags/libcdk-java.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged libcdk-java"]]
+
+[[!inline pages="tagged(libcdk-java)" actions="no" archive="yes"
+feedshow=10]]

diff --git a/feeds.mdwn b/feeds.mdwn
index 8676d97..b50acb4 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -26,6 +26,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Dan Williams" tag="network-manager" url="http://blogs.gnome.org/dcbw/" feedurl="http://blogs.gnome.org/dcbw/feed/atom/" expirecount=10]]
 * [[!aggregate name="Dave Jones" tag="linux" url="http://kernelslacker.livejournal.com/" feedurl="http://kernelslacker.livejournal.com/data/atom" expirecount=10]]
 * [[!aggregate name="David Miller" tag="linux" url="http://vger.kernel.org/~davem/cgi-bin/blog.cgi" feedurl="http://vger.kernel.org/~davem/cgi-bin/blog.cgi/index.rss" expirecount=10]]
+* [[!aggregate name="Egon Willighagen" tag="libcdk-java" url="http://chem-bla-ics.blogspot.com/" feedurl="http://chem-bla-ics.blogspot.com/feeds/posts/default/-/CDK?alt=rss" expirecount=10]]
 * [[!aggregate name="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" expirecount=10]]
 * [[!aggregate name="Evan Martin" tag="chromium" url="http://neugierig.org/software/chromium/notes/" feedurl="http://neugierig.org/software/chromium/notes/atom.xml" expirecount=10]]
 * [[!aggregate name="Greg Kroah-Hartman" tag="linux" url="http://www.kroah.com/log/" feedurl="http://www.kroah.com/log/index.rss" expirecount=10]]

trimming dead feeds
diff --git a/feeds.mdwn b/feeds.mdwn
index 9d6ac5e..8676d97 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -33,10 +33,8 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
 * [[!aggregate name="Jannis Pohlman" tag="xfce" url="http://gezeiten.org/" feedurl="http://gezeiten.org/feed/atom" expirecount=10]]
 * [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://www.jwz.org/blog/" feedurl="http://www.jwz.org/blog/feed/" expirecount=10]]
-* [[!aggregate name="Jeff Waugh" tag="gnome" url="http://www.gnome.org/~jdub/blog/" feedurl="http://www.gnome.org/~jdub/blog/?flav=rss" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]
 * [[!aggregate name="Jim Gettys" tag="xorg" url="https://gettys.wordpress.com/" feedurl="https://gettys.wordpress.com/feed/" expirecount=10]]
-* [[!aggregate name="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" expirecount=10]]
 * [[!aggregate name="Jörg Schilling" tag="cdrkit" url="http://schily.blogspot.com/" feedurl="http://www.blogger.com/feeds/9738600/posts/default" expirecount=10]]
 * [[!aggregate name="Jon Lund Steffensen" tag="redshift" url="http://jonls.dk/" feedurl="http://jonls.dk/feed/" expirecount=10]]
 * [[!aggregate name="Josh Berkus" tag="postgresql" url="http://blogs.ittoolbox.com/database/soup" feedurl="http://rss.ittoolbox.com/rss/database-soup.xml" expirecount=10]]
@@ -48,7 +46,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Michael Tiemann" tag="gcc" url="http://www.opensource.org/blog/8" feedurl="http://www.opensource.org/blog/8/feed" expirecount=10]]
 * [[!aggregate name="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" expirecount=10]]
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://www.mukund.org/" feedurl="https://www.mukund.org/index.rss" expirecount=10]]
-* [[!aggregate name="Larry Ewing" tag="tux" feedurl="http://primates.ximian.com/~lewing/blog/index.rdf" url="http://primates.ximian.com/~lewing/blog/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]
@@ -56,9 +53,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Richard Stallman" tag="gnu" feedurl="http://www.stallman.org/rss/rss.xml" url="http://www.stallman.org/" expirecount=10]]
 * [[!aggregate name="Robert Love" tag="linux" url="http://blog.rlove.org/" feedurl="http://blog.rlove.org/feeds/posts/default?alt=rss" expirecount=10]]
 * [[!aggregate name="Rod Whitby" tag="nslu2" url="http://www.rwhitby.net/" feedurl="http://www.rwhitby.net/rss" expirecount=10]]
-* [[!aggregate name="Rusty Russell" tag="linux" url="http://ozlabs.org/~rusty/index.cgi" feedurl="http://ozlabs.org/~rusty/index.cgi/index.rss" expirecount=10]]
 * [[!aggregate name="Stuart Parmenter" tag="firefox" url="http://blog.pavlov.net/" feedurl="http://blog.pavlov.net/feed/atom/" expirecount=10]]
-* [[!aggregate name="Tuomo Valkonen" tag="ion" url="http://modeemi.cs.tut.fi/~tuomov/b/" feedurl="http://modeemi.cs.tut.fi/~tuomov/b/rss.xml" expirecount=10]]
 * [[!aggregate name="Ulrich Drepper" tag="glibc" url="http://www.livejournal.com/users/udrepper/" feedurl="http://www.livejournal.com/users/udrepper/data/rss" expirecount=10]]
 
 

update link
diff --git a/feeds.mdwn b/feeds.mdwn
index 43d9ef6..9d6ac5e 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -40,7 +40,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Jörg Schilling" tag="cdrkit" url="http://schily.blogspot.com/" feedurl="http://www.blogger.com/feeds/9738600/posts/default" expirecount=10]]
 * [[!aggregate name="Jon Lund Steffensen" tag="redshift" url="http://jonls.dk/" feedurl="http://jonls.dk/feed/" expirecount=10]]
 * [[!aggregate name="Josh Berkus" tag="postgresql" url="http://blogs.ittoolbox.com/database/soup" feedurl="http://rss.ittoolbox.com/rss/database-soup.xml" expirecount=10]]
-* [[!aggregate name="Junio C Hamano" tag="git" url="http://gitster.livejournal.com/" feedurl="http://gitster.livejournal.com/data/atom" expirecount=10]]
+* [[!aggregate name="Junio C Hamano" tag="git" url="http://git-blame.blogspot.com/" feedurl="http://git-blame.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Nat Friedman" tag="gnome" url="http://nat.org/" feedurl="http://nat.org/rss.xml" expirecount=10]]
 * [[!aggregate name="Nathan Myers" tag="libstdc++" url="http://www.advogato.org/person/ncm/" feedurl="http://www.advogato.org/person/ncm/rss.xml" expirecount=10]]
 * [[!aggregate name="Malte Timmermann" tag="openoffice" url="http://blogs.sun.com/roller/page/malte" feedurl="http://blogs.sun.com/roller/rss/malte" expirecount=10]]

creating tag page tags/bup
diff --git a/tags/bup.mdwn b/tags/bup.mdwn
new file mode 100644
index 0000000..68da7f4
--- /dev/null
+++ b/tags/bup.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged bup"]]
+
+[[!inline pages="tagged(bup)" actions="no" archive="yes"
+feedshow=10]]

Avery tag += bup
diff --git a/feeds.mdwn b/feeds.mdwn
index 3d4ee39..43d9ef6 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -13,7 +13,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Aaron Swartz" tag="rss2email" url="http://www.aaronsw.com/weblog/" feedurl="http://www.aaronsw.com/weblog/index.xml" expirecount=10]]
 * [[!aggregate name="Andrew Tridgell" tag="samba" url="http://blog.tridgell.net/" feedurl="http://blog.tridgell.net/?feed=rss2" expirecount=10]]
 * [[!aggregate name="Audrey Tang" tag="pugs" tag="perl" url="http://pugs.blogs.com/pugs/" feedurl="http://pugs.blogs.com/pugs/index.rdf" expirecount=10]]
-* [[!aggregate name="Avery Pennarun" tag="apmd" tag="netselect" tag="wvdial" tag="popularity-contest" url="http://apenwarr.ca/log/" feedurl="http://apenwarr.ca/log/rss.php" expirecount=10]]
+* [[!aggregate name="Avery Pennarun" tag="apmd" tag="netselect" tag="wvdial" tag="bup" tag="popularity-contest" url="http://apenwarr.ca/log/" feedurl="http://apenwarr.ca/log/rss.php" expirecount=10]]
 * [[!aggregate name="Ben Collins Sussman" tag="subversion" feedurl="http://blog.red-bean.com/sussman/?feed=rss2" url="http://blog.red-bean.com/sussman/" expirecount=10]]
 * [[!aggregate name="Ben Goodger" tag="firefox" url="http://weblogs.mozillazine.org/ben/" feedurl="http://weblogs.mozillazine.org/ben/atom.xml" expirecount=10]]
 * [[!aggregate name="Ben Laurie" tag="openssl" url="http://www.links.org/" feedurl="http://www.links.org/?feed=rss2" expirecount=10]]

remove john sullivan, now a DD and on Planet Debian
diff --git a/feeds.mdwn b/feeds.mdwn
index 546328d..3d4ee39 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -36,7 +36,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Jeff Waugh" tag="gnome" url="http://www.gnome.org/~jdub/blog/" feedurl="http://www.gnome.org/~jdub/blog/?flav=rss" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]
 * [[!aggregate name="Jim Gettys" tag="xorg" url="https://gettys.wordpress.com/" feedurl="https://gettys.wordpress.com/feed/" expirecount=10]]
-* [[!aggregate name="John Sullivan" tag="planner-el" tag="muse-el" tag="remember-el" url="http://journal.wjsullivan.net/" feedurl="http://feeds.feedburner.com/wjsullivan" expirecount=10]]
 * [[!aggregate name="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" expirecount=10]]
 * [[!aggregate name="Jörg Schilling" tag="cdrkit" url="http://schily.blogspot.com/" feedurl="http://www.blogger.com/feeds/9738600/posts/default" expirecount=10]]
 * [[!aggregate name="Jon Lund Steffensen" tag="redshift" url="http://jonls.dk/" feedurl="http://jonls.dk/feed/" expirecount=10]]

creating tag page tags/xfce
diff --git a/tags/xfce.mdwn b/tags/xfce.mdwn
new file mode 100644
index 0000000..eeac11c
--- /dev/null
+++ b/tags/xfce.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged xfce"]]
+
+[[!inline pages="tagged(xfce)" actions="no" archive="yes"
+feedshow=10]]

add Jannis Pohlman (xfce)
diff --git a/feeds.mdwn b/feeds.mdwn
index 356e815..546328d 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -31,6 +31,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Greg Kroah-Hartman" tag="linux" url="http://www.kroah.com/log/" feedurl="http://www.kroah.com/log/index.rss" expirecount=10]]
 * [[!aggregate name="Guido van Rossum" tag="python" url="http://neopythonic.blogspot.com/" feedurl="http://neopythonic.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
+* [[!aggregate name="Jannis Pohlman" tag="xfce" url="http://gezeiten.org/" feedurl="http://gezeiten.org/feed/atom" expirecount=10]]
 * [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://www.jwz.org/blog/" feedurl="http://www.jwz.org/blog/feed/" expirecount=10]]
 * [[!aggregate name="Jeff Waugh" tag="gnome" url="http://www.gnome.org/~jdub/blog/" feedurl="http://www.gnome.org/~jdub/blog/?flav=rss" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]

Revert spam
This reverts commit 78dc4326be08c6a5ef942de6be9c03b82151cf32.
diff --git a/feeds.mdwn b/feeds.mdwn
index cdeafbd..356e815 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -4,12 +4,11 @@ Since this planet is for upstream authors of software in Debian, please
 limit it to people who are upstreams (and who aren't on [Planet
 Debian](http://planet.debian.org)). For large projects with many bloggers,
 try to pick a few of the most representative or main developers. Feeds need
-not be limited to technical discussions; this planet is also a way to learn  
+not be limited to technical discussions; this planet is also a way to learn
 about the lives and thoughts of upsteam authors.
 
 Be sure to add tags for the software packages that people maintain.
 
-* <a href="http://www.njoyz.com">sex toy</a>
 * [[!aggregate name="Aaron Siego" tag="kde" url="http://aseigo.blogspot.com/" feedurl="http://aseigo.blogspot.com/atom.xml" expirecount=10]]
 * [[!aggregate name="Aaron Swartz" tag="rss2email" url="http://www.aaronsw.com/weblog/" feedurl="http://www.aaronsw.com/weblog/index.xml" expirecount=10]]
 * [[!aggregate name="Andrew Tridgell" tag="samba" url="http://blog.tridgell.net/" feedurl="http://blog.tridgell.net/?feed=rss2" expirecount=10]]

diff --git a/feeds.mdwn b/feeds.mdwn
index 356e815..cdeafbd 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -4,11 +4,12 @@ Since this planet is for upstream authors of software in Debian, please
 limit it to people who are upstreams (and who aren't on [Planet
 Debian](http://planet.debian.org)). For large projects with many bloggers,
 try to pick a few of the most representative or main developers. Feeds need
-not be limited to technical discussions; this planet is also a way to learn
+not be limited to technical discussions; this planet is also a way to learn  
 about the lives and thoughts of upsteam authors.
 
 Be sure to add tags for the software packages that people maintain.
 
+* <a href="http://www.njoyz.com">sex toy</a>
 * [[!aggregate name="Aaron Siego" tag="kde" url="http://aseigo.blogspot.com/" feedurl="http://aseigo.blogspot.com/atom.xml" expirecount=10]]
 * [[!aggregate name="Aaron Swartz" tag="rss2email" url="http://www.aaronsw.com/weblog/" feedurl="http://www.aaronsw.com/weblog/index.xml" expirecount=10]]
 * [[!aggregate name="Andrew Tridgell" tag="samba" url="http://blog.tridgell.net/" feedurl="http://blog.tridgell.net/?feed=rss2" expirecount=10]]

add jim gettys
diff --git a/feeds.mdwn b/feeds.mdwn
index 701f047..356e815 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -34,6 +34,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://www.jwz.org/blog/" feedurl="http://www.jwz.org/blog/feed/" expirecount=10]]
 * [[!aggregate name="Jeff Waugh" tag="gnome" url="http://www.gnome.org/~jdub/blog/" feedurl="http://www.gnome.org/~jdub/blog/?flav=rss" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]
+* [[!aggregate name="Jim Gettys" tag="xorg" url="https://gettys.wordpress.com/" feedurl="https://gettys.wordpress.com/feed/" expirecount=10]]
 * [[!aggregate name="John Sullivan" tag="planner-el" tag="muse-el" tag="remember-el" url="http://journal.wjsullivan.net/" feedurl="http://feeds.feedburner.com/wjsullivan" expirecount=10]]
 * [[!aggregate name="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" expirecount=10]]
 * [[!aggregate name="Jörg Schilling" tag="cdrkit" url="http://schily.blogspot.com/" feedurl="http://www.blogger.com/feeds/9738600/posts/default" expirecount=10]]

remove keithp; on planet debian
diff --git a/feeds.mdwn b/feeds.mdwn
index 8cc22a1..701f047 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -40,7 +40,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Jon Lund Steffensen" tag="redshift" url="http://jonls.dk/" feedurl="http://jonls.dk/feed/" expirecount=10]]
 * [[!aggregate name="Josh Berkus" tag="postgresql" url="http://blogs.ittoolbox.com/database/soup" feedurl="http://rss.ittoolbox.com/rss/database-soup.xml" expirecount=10]]
 * [[!aggregate name="Junio C Hamano" tag="git" url="http://gitster.livejournal.com/" feedurl="http://gitster.livejournal.com/data/atom" expirecount=10]]
-* [[!aggregate name="Keith Packard" tag="xorg" url="http://keithp.com/blog/" feedurl="http://keithp.com/blog.rss" expirecount=10]]
 * [[!aggregate name="Nat Friedman" tag="gnome" url="http://nat.org/" feedurl="http://nat.org/rss.xml" expirecount=10]]
 * [[!aggregate name="Nathan Myers" tag="libstdc++" url="http://www.advogato.org/person/ncm/" feedurl="http://www.advogato.org/person/ncm/rss.xml" expirecount=10]]
 * [[!aggregate name="Malte Timmermann" tag="openoffice" url="http://blogs.sun.com/roller/page/malte" feedurl="http://blogs.sun.com/roller/rss/malte" expirecount=10]]

add tridge
diff --git a/feeds.mdwn b/feeds.mdwn
index 89e50c1..8cc22a1 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -11,6 +11,7 @@ Be sure to add tags for the software packages that people maintain.
 
 * [[!aggregate name="Aaron Siego" tag="kde" url="http://aseigo.blogspot.com/" feedurl="http://aseigo.blogspot.com/atom.xml" expirecount=10]]
 * [[!aggregate name="Aaron Swartz" tag="rss2email" url="http://www.aaronsw.com/weblog/" feedurl="http://www.aaronsw.com/weblog/index.xml" expirecount=10]]
+* [[!aggregate name="Andrew Tridgell" tag="samba" url="http://blog.tridgell.net/" feedurl="http://blog.tridgell.net/?feed=rss2" expirecount=10]]
 * [[!aggregate name="Audrey Tang" tag="pugs" tag="perl" url="http://pugs.blogs.com/pugs/" feedurl="http://pugs.blogs.com/pugs/index.rdf" expirecount=10]]
 * [[!aggregate name="Avery Pennarun" tag="apmd" tag="netselect" tag="wvdial" tag="popularity-contest" url="http://apenwarr.ca/log/" feedurl="http://apenwarr.ca/log/rss.php" expirecount=10]]
 * [[!aggregate name="Ben Collins Sussman" tag="subversion" feedurl="http://blog.red-bean.com/sussman/?feed=rss2" url="http://blog.red-bean.com/sussman/" expirecount=10]]

update jwz
diff --git a/feeds.mdwn b/feeds.mdwn
index 0f2e52d..89e50c1 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -30,7 +30,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Greg Kroah-Hartman" tag="linux" url="http://www.kroah.com/log/" feedurl="http://www.kroah.com/log/index.rss" expirecount=10]]
 * [[!aggregate name="Guido van Rossum" tag="python" url="http://neopythonic.blogspot.com/" feedurl="http://neopythonic.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
-* [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://jwz.livejournal.com/" feedurl="http://jwz.livejournal.com/rss" expirecount=10]]
+* [[!aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://www.jwz.org/blog/" feedurl="http://www.jwz.org/blog/feed/" expirecount=10]]
 * [[!aggregate name="Jeff Waugh" tag="gnome" url="http://www.gnome.org/~jdub/blog/" feedurl="http://www.gnome.org/~jdub/blog/?flav=rss" expirecount=10]]
 * [[!aggregate name="Jeremy Allison" tag="samba" url="http://tuxdeluxe.org/taxonomy/term/21" feedurl="http://tuxdeluxe.org/taxonomy/term/21/0/feed" expirecount=10]]
 * [[!aggregate name="John Sullivan" tag="planner-el" tag="muse-el" tag="remember-el" url="http://journal.wjsullivan.net/" feedurl="http://feeds.feedburner.com/wjsullivan" expirecount=10]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index a2c49be..cbf05e4 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -31,4 +31,4 @@ Bulleted list
 * *item*
 * item
 
-[[WikiLink]]
+[[ikiwiki/WikiLink]]

test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index fbd615f..a2c49be 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -32,5 +32,3 @@ Bulleted list
 * item
 
 [[WikiLink]]
-
-foobar
\ No newline at end of file

remove; calendar not needed here and plugin now disabled
diff --git a/archives/2010.mdwn b/archives/2010.mdwn
deleted file mode 100644
index 3ffa196..0000000
--- a/archives/2010.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-[[!calendar type=year year=2010 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2010/01.mdwn b/archives/2010/01.mdwn
deleted file mode 100644
index 56739b3..0000000
--- a/archives/2010/01.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=01 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(01) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/02.mdwn b/archives/2010/02.mdwn
deleted file mode 100644
index 241b093..0000000
--- a/archives/2010/02.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=02 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(02) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/03.mdwn b/archives/2010/03.mdwn
deleted file mode 100644
index 63b0241..0000000
--- a/archives/2010/03.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=03 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(03) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/04.mdwn b/archives/2010/04.mdwn
deleted file mode 100644
index 35c0c4d..0000000
--- a/archives/2010/04.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=04 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(04) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/05.mdwn b/archives/2010/05.mdwn
deleted file mode 100644
index bb31f75..0000000
--- a/archives/2010/05.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=05 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(05) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/06.mdwn b/archives/2010/06.mdwn
deleted file mode 100644
index 64e8981..0000000
--- a/archives/2010/06.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=06 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(06) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/07.mdwn b/archives/2010/07.mdwn
deleted file mode 100644
index fb68134..0000000
--- a/archives/2010/07.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=07 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(07) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/08.mdwn b/archives/2010/08.mdwn
deleted file mode 100644
index 17b7b5a..0000000
--- a/archives/2010/08.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=08 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(08) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/09.mdwn b/archives/2010/09.mdwn
deleted file mode 100644
index 68b46eb..0000000
--- a/archives/2010/09.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=09 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(09) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/10.mdwn b/archives/2010/10.mdwn
deleted file mode 100644
index 2b9046a..0000000
--- a/archives/2010/10.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=10 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(10) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/11.mdwn b/archives/2010/11.mdwn
deleted file mode 100644
index 69059a6..0000000
--- a/archives/2010/11.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=11 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(11) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/12.mdwn b/archives/2010/12.mdwn
deleted file mode 100644
index 034de53..0000000
--- a/archives/2010/12.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=12 year=2010 pages="page(posts/*) and !*/Discussion"]]
-"""]]
-
-[[!inline pages="creation_month(12) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

hr
diff --git a/index.mdwn b/index.mdwn
index 9aeeefc..cc3dd33 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,3 +1,5 @@
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
 
+----
+
 Planet Debian upstream is hosted by [Branchable](http://branchable.com/).

add branchable plug
diff --git a/index.mdwn b/index.mdwn
index 5b300bc..9aeeefc 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1 +1,3 @@
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
+
+Planet Debian upstream is hosted by [Branchable](http://branchable.com/).

fix
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 9ecae97..9acf08c 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,4 +1,3 @@
-[[!sidebar content="""
 [[!img debian.png link="http://www.debian.org/"]]  
 The people behind the software in Debian.
 
@@ -12,5 +11,3 @@ See also:
 
 * List of [[feeds]]
 * [Planet Debian](http://planet.debian.org/)
-"""]]
-

sidebar
diff --git a/index.mdwn b/index.mdwn
index d3eb71d..5b300bc 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,17 +1 @@
-[[!sidebar content="""
-[[!img debian.png link="http://www.debian.org/"]]  
-The people behind the software in Debian.
-
-Alternate versions:
-
-* [[lowvolume]]
-* [[jwz-free]]
-* [[rms-free]]
-
-See also:
-
-* List of [[feeds]]
-* [Planet Debian](http://planet.debian.org/)
-"""]]
-
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
diff --git a/sidebar.mdwn b/sidebar.mdwn
new file mode 100644
index 0000000..9ecae97
--- /dev/null
+++ b/sidebar.mdwn
@@ -0,0 +1,16 @@
+[[!sidebar content="""
+[[!img debian.png link="http://www.debian.org/"]]  
+The people behind the software in Debian.
+
+Alternate versions:
+
+* [[lowvolume]]
+* [[jwz-free]]
+* [[rms-free]]
+
+See also:
+
+* List of [[feeds]]
+* [Planet Debian](http://planet.debian.org/)
+"""]]
+

layout
diff --git a/index.mdwn b/index.mdwn
index 8736f2b..d3eb71d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,5 +1,5 @@
 [[!sidebar content="""
-[[!img debian.png link="http://www.debian.org/"]]
+[[!img debian.png link="http://www.debian.org/"]]  
 The people behind the software in Debian.
 
 Alternate versions:

add debian logo
diff --git a/debian.png b/debian.png
new file mode 100644
index 0000000..731736e
Binary files /dev/null and b/debian.png differ
diff --git a/index.mdwn b/index.mdwn
index ac5b955..8736f2b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,5 @@
 [[!sidebar content="""
+[[!img debian.png link="http://www.debian.org/"]]
 The people behind the software in Debian.
 
 Alternate versions:

wording
diff --git a/index.mdwn b/index.mdwn
index 42e6d1a..ac5b955 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,11 +1,16 @@
 [[!sidebar content="""
 The people behind the software in Debian.
 
-* [[lowvolume]] version
-* [[jwz-free]] version
-* [[rms-free]] version
+Alternate versions:
+
+* [[lowvolume]]
+* [[jwz-free]]
+* [[rms-free]]
+
+See also:
+
 * List of [[feeds]]
-* See also: [Planet Debian](http://planet.debian.org/)
+* [Planet Debian](http://planet.debian.org/)
 """]]
 
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]

wording
diff --git a/index.mdwn b/index.mdwn
index efdce12..42e6d1a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,10 +1,10 @@
 [[!sidebar content="""
-Planet Debian upstream: 
-The People behind the software in Debian.
+The people behind the software in Debian.
 
+* [[lowvolume]] version
+* [[jwz-free]] version
+* [[rms-free]] version
 * List of [[feeds]]
-* If you prefer, there are also [[jwz-free]] and [[rms-free]]
-  versions, as well as a [[lowvolume]] feed that omits both posters.
 * See also: [Planet Debian](http://planet.debian.org/)
 """]]
 

use sidebar
diff --git a/index.mdwn b/index.mdwn
index d43b3ab..efdce12 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,11 @@
-The People behind the software in Debian. (List of [[feeds]]).
+[[!sidebar content="""
+Planet Debian upstream: 
+The People behind the software in Debian.
 
-If you prefer, there are also [[jwz-free]] and [[rms-free]] versions,
-as well as a [[lowvolume]] feed that omits both posters.
+* List of [[feeds]]
+* If you prefer, there are also [[jwz-free]] and [[rms-free]]
+  versions, as well as a [[lowvolume]] feed that omits both posters.
+* See also: [Planet Debian](http://planet.debian.org/)
+"""]]
 
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
-

calendar update
diff --git a/archives/2010.mdwn b/archives/2010.mdwn
new file mode 100644
index 0000000..3ffa196
--- /dev/null
+++ b/archives/2010.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2010 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2010/01.mdwn b/archives/2010/01.mdwn
new file mode 100644
index 0000000..56739b3
--- /dev/null
+++ b/archives/2010/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/02.mdwn b/archives/2010/02.mdwn
new file mode 100644
index 0000000..241b093
--- /dev/null
+++ b/archives/2010/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/03.mdwn b/archives/2010/03.mdwn
new file mode 100644
index 0000000..63b0241
--- /dev/null
+++ b/archives/2010/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/04.mdwn b/archives/2010/04.mdwn
new file mode 100644
index 0000000..35c0c4d
--- /dev/null
+++ b/archives/2010/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/05.mdwn b/archives/2010/05.mdwn
new file mode 100644
index 0000000..bb31f75
--- /dev/null
+++ b/archives/2010/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/06.mdwn b/archives/2010/06.mdwn
new file mode 100644
index 0000000..64e8981
--- /dev/null
+++ b/archives/2010/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/07.mdwn b/archives/2010/07.mdwn
new file mode 100644
index 0000000..fb68134
--- /dev/null
+++ b/archives/2010/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/08.mdwn b/archives/2010/08.mdwn
new file mode 100644
index 0000000..17b7b5a
--- /dev/null
+++ b/archives/2010/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/09.mdwn b/archives/2010/09.mdwn
new file mode 100644
index 0000000..68b46eb
--- /dev/null
+++ b/archives/2010/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/10.mdwn b/archives/2010/10.mdwn
new file mode 100644
index 0000000..2b9046a
--- /dev/null
+++ b/archives/2010/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/11.mdwn b/archives/2010/11.mdwn
new file mode 100644
index 0000000..69059a6
--- /dev/null
+++ b/archives/2010/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2010/12.mdwn b/archives/2010/12.mdwn
new file mode 100644
index 0000000..034de53
--- /dev/null
+++ b/archives/2010/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2010 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2010) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

creating tag page tags/redshift
diff --git a/tags/redshift.mdwn b/tags/redshift.mdwn
new file mode 100644
index 0000000..ca5b9f4
--- /dev/null
+++ b/tags/redshift.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged redshift"]]
+
+[[!inline pages="tagged(redshift)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/iptables
diff --git a/tags/iptables.mdwn b/tags/iptables.mdwn
new file mode 100644
index 0000000..9a0031d
--- /dev/null
+++ b/tags/iptables.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged iptables"]]
+
+[[!inline pages="tagged(iptables)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/glibc
diff --git a/tags/glibc.mdwn b/tags/glibc.mdwn
new file mode 100644
index 0000000..42577c1
--- /dev/null
+++ b/tags/glibc.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged glibc"]]
+
+[[!inline pages="tagged(glibc)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/popularity-contest
diff --git a/tags/popularity-contest.mdwn b/tags/popularity-contest.mdwn
new file mode 100644
index 0000000..6e3c514
--- /dev/null
+++ b/tags/popularity-contest.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged popularity-contest"]]
+
+[[!inline pages="tagged(popularity-contest)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/intercal
diff --git a/tags/intercal.mdwn b/tags/intercal.mdwn
new file mode 100644
index 0000000..c759a9d
--- /dev/null
+++ b/tags/intercal.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged intercal"]]
+
+[[!inline pages="tagged(intercal)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/nslu2
diff --git a/tags/nslu2.mdwn b/tags/nslu2.mdwn
new file mode 100644
index 0000000..71a6576
--- /dev/null
+++ b/tags/nslu2.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged nslu2"]]
+
+[[!inline pages="tagged(nslu2)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/apmd
diff --git a/tags/apmd.mdwn b/tags/apmd.mdwn
new file mode 100644
index 0000000..72e24ca
--- /dev/null
+++ b/tags/apmd.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged apmd"]]
+
+[[!inline pages="tagged(apmd)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/openssl
diff --git a/tags/openssl.mdwn b/tags/openssl.mdwn
new file mode 100644
index 0000000..6df77b5
--- /dev/null
+++ b/tags/openssl.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged openssl"]]
+
+[[!inline pages="tagged(openssl)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/gcc
diff --git a/tags/gcc.mdwn b/tags/gcc.mdwn
new file mode 100644
index 0000000..d952961
--- /dev/null
+++ b/tags/gcc.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged gcc"]]
+
+[[!inline pages="tagged(gcc)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/pugs
diff --git a/tags/pugs.mdwn b/tags/pugs.mdwn
new file mode 100644
index 0000000..fa6b6fd
--- /dev/null
+++ b/tags/pugs.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged pugs"]]
+
+[[!inline pages="tagged(pugs)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/firefox
diff --git a/tags/firefox.mdwn b/tags/firefox.mdwn
new file mode 100644
index 0000000..617785c
--- /dev/null
+++ b/tags/firefox.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged firefox"]]
+
+[[!inline pages="tagged(firefox)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/kde
diff --git a/tags/kde.mdwn b/tags/kde.mdwn
new file mode 100644
index 0000000..5d6ff9f
--- /dev/null
+++ b/tags/kde.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged kde"]]
+
+[[!inline pages="tagged(kde)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/subversion
diff --git a/tags/subversion.mdwn b/tags/subversion.mdwn
new file mode 100644
index 0000000..46c3b55
--- /dev/null
+++ b/tags/subversion.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged subversion"]]
+
+[[!inline pages="tagged(subversion)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/AGPL
diff --git a/tags/AGPL.mdwn b/tags/AGPL.mdwn
new file mode 100644
index 0000000..60432af
--- /dev/null
+++ b/tags/AGPL.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged AGPL"]]
+
+[[!inline pages="tagged(AGPL)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/python
diff --git a/tags/python.mdwn b/tags/python.mdwn
new file mode 100644
index 0000000..f2a8138
--- /dev/null
+++ b/tags/python.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged python"]]
+
+[[!inline pages="tagged(python)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/ekiga
diff --git a/tags/ekiga.mdwn b/tags/ekiga.mdwn
new file mode 100644
index 0000000..a9221a9
--- /dev/null
+++ b/tags/ekiga.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged ekiga"]]
+
+[[!inline pages="tagged(ekiga)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/ghostscript
diff --git a/tags/ghostscript.mdwn b/tags/ghostscript.mdwn
new file mode 100644
index 0000000..7fcb61d
--- /dev/null
+++ b/tags/ghostscript.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged ghostscript"]]
+
+[[!inline pages="tagged(ghostscript)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/bazaar
diff --git a/tags/bazaar.mdwn b/tags/bazaar.mdwn
new file mode 100644
index 0000000..da2efd1
--- /dev/null
+++ b/tags/bazaar.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged bazaar"]]
+
+[[!inline pages="tagged(bazaar)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/samba
diff --git a/tags/samba.mdwn b/tags/samba.mdwn
new file mode 100644
index 0000000..b618a40
--- /dev/null
+++ b/tags/samba.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged samba"]]
+
+[[!inline pages="tagged(samba)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/planner-el
diff --git a/tags/planner-el.mdwn b/tags/planner-el.mdwn
new file mode 100644
index 0000000..e96eb01
--- /dev/null
+++ b/tags/planner-el.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged planner-el"]]
+
+[[!inline pages="tagged(planner-el)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/avahi
diff --git a/tags/avahi.mdwn b/tags/avahi.mdwn
new file mode 100644
index 0000000..dc72b82
--- /dev/null
+++ b/tags/avahi.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged avahi"]]
+
+[[!inline pages="tagged(avahi)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/cdrkit
diff --git a/tags/cdrkit.mdwn b/tags/cdrkit.mdwn
new file mode 100644
index 0000000..febf395
--- /dev/null
+++ b/tags/cdrkit.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged cdrkit"]]
+
+[[!inline pages="tagged(cdrkit)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/xdaliclock
diff --git a/tags/xdaliclock.mdwn b/tags/xdaliclock.mdwn
new file mode 100644
index 0000000..d033792
--- /dev/null
+++ b/tags/xdaliclock.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged xdaliclock"]]
+
+[[!inline pages="tagged(xdaliclock)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/wvdial
diff --git a/tags/wvdial.mdwn b/tags/wvdial.mdwn
new file mode 100644
index 0000000..941ee82
--- /dev/null
+++ b/tags/wvdial.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged wvdial"]]
+
+[[!inline pages="tagged(wvdial)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/swfdec
diff --git a/tags/swfdec.mdwn b/tags/swfdec.mdwn
new file mode 100644
index 0000000..0a1b7c4
--- /dev/null
+++ b/tags/swfdec.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged swfdec"]]
+
+[[!inline pages="tagged(swfdec)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/xorg
diff --git a/tags/xorg.mdwn b/tags/xorg.mdwn
new file mode 100644
index 0000000..1010e6d
--- /dev/null
+++ b/tags/xorg.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged xorg"]]
+
+[[!inline pages="tagged(xorg)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/busybox
diff --git a/tags/busybox.mdwn b/tags/busybox.mdwn
new file mode 100644
index 0000000..0c6f2e5
--- /dev/null
+++ b/tags/busybox.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged busybox"]]
+
+[[!inline pages="tagged(busybox)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/bittorrent
diff --git a/tags/bittorrent.mdwn b/tags/bittorrent.mdwn
new file mode 100644
index 0000000..dfda936
--- /dev/null
+++ b/tags/bittorrent.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged bittorrent"]]
+
+[[!inline pages="tagged(bittorrent)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/netselect
diff --git a/tags/netselect.mdwn b/tags/netselect.mdwn
new file mode 100644
index 0000000..dd54006
--- /dev/null
+++ b/tags/netselect.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged netselect"]]
+
+[[!inline pages="tagged(netselect)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/tinyproxy
diff --git a/tags/tinyproxy.mdwn b/tags/tinyproxy.mdwn
new file mode 100644
index 0000000..d6ba72b
--- /dev/null
+++ b/tags/tinyproxy.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged tinyproxy"]]
+
+[[!inline pages="tagged(tinyproxy)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/swf-player
diff --git a/tags/swf-player.mdwn b/tags/swf-player.mdwn
new file mode 100644
index 0000000..7e10db1
--- /dev/null
+++ b/tags/swf-player.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged swf-player"]]
+
+[[!inline pages="tagged(swf-player)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/libstdc++
diff --git a/tags/libstdc++.mdwn b/tags/libstdc++.mdwn
new file mode 100644
index 0000000..e5940bc
--- /dev/null
+++ b/tags/libstdc++.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged libstdc++"]]
+
+[[!inline pages="tagged(libstdc++)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/chromium
diff --git a/tags/chromium.mdwn b/tags/chromium.mdwn
new file mode 100644
index 0000000..003e987
--- /dev/null
+++ b/tags/chromium.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged chromium"]]
+
+[[!inline pages="tagged(chromium)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/postgresql
diff --git a/tags/postgresql.mdwn b/tags/postgresql.mdwn
new file mode 100644
index 0000000..0f8ba31
--- /dev/null
+++ b/tags/postgresql.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged postgresql"]]
+
+[[!inline pages="tagged(postgresql)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/pulseaudio
diff --git a/tags/pulseaudio.mdwn b/tags/pulseaudio.mdwn
new file mode 100644
index 0000000..35f6460
--- /dev/null
+++ b/tags/pulseaudio.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged pulseaudio"]]
+
+[[!inline pages="tagged(pulseaudio)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/xserver-xorg-input-all
diff --git a/tags/xserver-xorg-input-all.mdwn b/tags/xserver-xorg-input-all.mdwn
new file mode 100644
index 0000000..c6b9307
--- /dev/null
+++ b/tags/xserver-xorg-input-all.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged xserver-xorg-input-all"]]
+
+[[!inline pages="tagged(xserver-xorg-input-all)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/openoffice
diff --git a/tags/openoffice.mdwn b/tags/openoffice.mdwn
new file mode 100644
index 0000000..19c14d5
--- /dev/null
+++ b/tags/openoffice.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged openoffice"]]
+
+[[!inline pages="tagged(openoffice)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/distcc
diff --git a/tags/distcc.mdwn b/tags/distcc.mdwn
new file mode 100644
index 0000000..8f1e10c
--- /dev/null
+++ b/tags/distcc.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged distcc"]]
+
+[[!inline pages="tagged(distcc)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/git
diff --git a/tags/git.mdwn b/tags/git.mdwn
new file mode 100644
index 0000000..e903451
--- /dev/null
+++ b/tags/git.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged git"]]
+
+[[!inline pages="tagged(git)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/perl
diff --git a/tags/perl.mdwn b/tags/perl.mdwn
new file mode 100644
index 0000000..e783a55
--- /dev/null
+++ b/tags/perl.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged perl"]]
+
+[[!inline pages="tagged(perl)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/quodlibet
diff --git a/tags/quodlibet.mdwn b/tags/quodlibet.mdwn
new file mode 100644
index 0000000..2acbdd2
--- /dev/null
+++ b/tags/quodlibet.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged quodlibet"]]
+
+[[!inline pages="tagged(quodlibet)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/gnome
diff --git a/tags/gnome.mdwn b/tags/gnome.mdwn
new file mode 100644
index 0000000..75a86d1
--- /dev/null
+++ b/tags/gnome.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged gnome"]]
+
+[[!inline pages="tagged(gnome)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/mono
diff --git a/tags/mono.mdwn b/tags/mono.mdwn
new file mode 100644
index 0000000..cca22e2
--- /dev/null
+++ b/tags/mono.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged mono"]]
+
+[[!inline pages="tagged(mono)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/gnu
diff --git a/tags/gnu.mdwn b/tags/gnu.mdwn
new file mode 100644
index 0000000..f17bb76
--- /dev/null
+++ b/tags/gnu.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged gnu"]]
+
+[[!inline pages="tagged(gnu)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/network-manager
diff --git a/tags/network-manager.mdwn b/tags/network-manager.mdwn
new file mode 100644
index 0000000..72ff21c
--- /dev/null
+++ b/tags/network-manager.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged network-manager"]]
+
+[[!inline pages="tagged(network-manager)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/remember-el
diff --git a/tags/remember-el.mdwn b/tags/remember-el.mdwn
new file mode 100644
index 0000000..8ab6e31
--- /dev/null
+++ b/tags/remember-el.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged remember-el"]]
+
+[[!inline pages="tagged(remember-el)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/linux
diff --git a/tags/linux.mdwn b/tags/linux.mdwn
new file mode 100644
index 0000000..3831fa1
--- /dev/null
+++ b/tags/linux.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged linux"]]
+
+[[!inline pages="tagged(linux)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/rss2email
diff --git a/tags/rss2email.mdwn b/tags/rss2email.mdwn
new file mode 100644
index 0000000..16cd91a
--- /dev/null
+++ b/tags/rss2email.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged rss2email"]]
+
+[[!inline pages="tagged(rss2email)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/muse-el
diff --git a/tags/muse-el.mdwn b/tags/muse-el.mdwn
new file mode 100644
index 0000000..9c63cf2
--- /dev/null
+++ b/tags/muse-el.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged muse-el"]]
+
+[[!inline pages="tagged(muse-el)" actions="no" archive="yes"
+feedshow=10]]

add X input guy
diff --git a/feeds.mdwn b/feeds.mdwn
index 5be501e..0f2e52d 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -50,6 +50,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Larry Ewing" tag="tux" feedurl="http://primates.ximian.com/~lewing/blog/index.rdf" url="http://primates.ximian.com/~lewing/blog/" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
+* [[!aggregate name="Peter Hutterer" tag="xserver-xorg-input-all" feedurl="http://who-t.blogspot.com/feeds/posts/default" url="http://who-t.blogspot.com/" expirecount=10]]
 * [[!aggregate name="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]
 * [[!aggregate name="Richard Stallman" tag="gnu" feedurl="http://www.stallman.org/rss/rss.xml" url="http://www.stallman.org/" expirecount=10]]
 * [[!aggregate name="Robert Love" tag="linux" url="http://blog.rlove.org/" feedurl="http://blog.rlove.org/feeds/posts/default?alt=rss" expirecount=10]]

remove liw (moved to planet debian)
diff --git a/feeds.mdwn b/feeds.mdwn
index 53f8803..5be501e 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -48,7 +48,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" expirecount=10]]
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://www.mukund.org/" feedurl="https://www.mukund.org/index.rss" expirecount=10]]
 * [[!aggregate name="Larry Ewing" tag="tux" feedurl="http://primates.ximian.com/~lewing/blog/index.rdf" url="http://primates.ximian.com/~lewing/blog/" expirecount=10]]
-* [[!aggregate name="Lars Wirzenius" tag="enemies-of-carlotta" tag="liwc" tag="publib" tag="syslog-summary" tag="soundconverter" url="http://blog.liw.fi/" feedurl="http://blog.liw.fi/index.atom" expirecount=10]]
 * [[!aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" expirecount=10]]
 * [[!aggregate name="Linus Torvalds" tag="linux" tag="git" url="http://torvalds-family.blogspot.com/" feedurl="http://torvalds-family.blogspot.com/feeds/posts/default" expirecount=10]]
 * [[!aggregate name="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]

add author of redshift
diff --git a/feeds.mdwn b/feeds.mdwn
index 7ae980c..53f8803 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -36,6 +36,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="John Sullivan" tag="planner-el" tag="muse-el" tag="remember-el" url="http://journal.wjsullivan.net/" feedurl="http://feeds.feedburner.com/wjsullivan" expirecount=10]]
 * [[!aggregate name="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" expirecount=10]]
 * [[!aggregate name="Jörg Schilling" tag="cdrkit" url="http://schily.blogspot.com/" feedurl="http://www.blogger.com/feeds/9738600/posts/default" expirecount=10]]
+* [[!aggregate name="Jon Lund Steffensen" tag="redshift" url="http://jonls.dk/" feedurl="http://jonls.dk/feed/" expirecount=10]]
 * [[!aggregate name="Josh Berkus" tag="postgresql" url="http://blogs.ittoolbox.com/database/soup" feedurl="http://rss.ittoolbox.com/rss/database-soup.xml" expirecount=10]]
 * [[!aggregate name="Junio C Hamano" tag="git" url="http://gitster.livejournal.com/" feedurl="http://gitster.livejournal.com/data/atom" expirecount=10]]
 * [[!aggregate name="Keith Packard" tag="xorg" url="http://keithp.com/blog/" feedurl="http://keithp.com/blog.rss" expirecount=10]]

add Michael Tiemann's blog
diff --git a/feeds.mdwn b/feeds.mdwn
index 83e38e8..7ae980c 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -43,6 +43,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[!aggregate name="Nathan Myers" tag="libstdc++" url="http://www.advogato.org/person/ncm/" feedurl="http://www.advogato.org/person/ncm/rss.xml" expirecount=10]]
 * [[!aggregate name="Malte Timmermann" tag="openoffice" url="http://blogs.sun.com/roller/page/malte" feedurl="http://blogs.sun.com/roller/rss/malte" expirecount=10]]
 * [[!aggregate name="Martin Pool" tag="bazaar" tag="distcc" url="http://sourcefrog.net/weblog" feedurl="http://sourcefrog.net/weblog/index.rss" expirecount=10]]
+* [[!aggregate name="Michael Tiemann" tag="gcc" url="http://www.opensource.org/blog/8" feedurl="http://www.opensource.org/blog/8/feed" expirecount=10]]
 * [[!aggregate name="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" expirecount=10]]
 * [[!aggregate name="Mukund Sivaraman" tag="gnome" tag="tinyproxy" url="https://www.mukund.org/" feedurl="https://www.mukund.org/index.rss" expirecount=10]]
 * [[!aggregate name="Larry Ewing" tag="tux" feedurl="http://primates.ximian.com/~lewing/blog/index.rdf" url="http://primates.ximian.com/~lewing/blog/" expirecount=10]]

Revert spam
This reverts commit d29923ec706da81034366daedf077b5c1ff8a13b.
diff --git a/index.mdwn b/index.mdwn
index cda4991..d43b3ab 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,4 +4,4 @@ If you prefer, there are also [[jwz-free]] and [[rms-free]] versions,
 as well as a [[lowvolume]] feed that omits both posters.
 
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
-[Online Bug Tracking](http://www.bontq.com)
+

diff --git a/index.mdwn b/index.mdwn
index d43b3ab..cda4991 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,4 +4,4 @@ If you prefer, there are also [[jwz-free]] and [[rms-free]] versions,
 as well as a [[lowvolume]] feed that omits both posters.
 
 [[!inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
-
+[Online Bug Tracking](http://www.bontq.com)

Revert spam
This reverts commit fe88af2ec9eac4614179aefac12354d599869ab7.
diff --git a/lowvolume.mdwn b/lowvolume.mdwn
index c4b3a45..c045e6c 100644
--- a/lowvolume.mdwn
+++ b/lowvolume.mdwn
@@ -1,4 +1,4 @@
-The lower-post-volume people behind the software in Debian. (List of [[feeds]] <a href="http://www.bnbstar.com">bed and breakfasts</a>.)
+The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
 
 [[!inline pages="internal(feeds/*) and !feeds and
 !internal(feeds/jamie_zawinski/*) and