diff --git a/feeds.mdwn b/feeds.mdwn
index 28398ad..5803e50 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -43,7 +43,7 @@ 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="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/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]]
 

diff --git a/feeds.mdwn b/feeds.mdwn
index b043d0c..28398ad 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -22,6 +22,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[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="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" 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]]
+* [[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="Jim Gettys" tag="xorg" url="http://www.gettysfamily.org/wordpress/" feedurl="http://www.gettysfamily.org/wordpress/?feed=rss2" expirecount=10]]

diff --git a/feeds.mdwn b/feeds.mdwn
index ce37855..b043d0c 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -28,6 +28,7 @@ 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="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" 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="Malte Timmermann" tag="openoffice" url="http://blogs.sun.com/roller/page/malte" feedurl="http://blogs.sun.com/roller/rss/malte" expirecount=10]]

diff --git a/feeds.mdwn b/feeds.mdwn
index 0542c10..ce37855 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -35,6 +35,7 @@ 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="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="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]]

diff --git a/jwz-free.mdwn b/jwz-free.mdwn
index defc2a4..6aff4a3 100644
--- a/jwz-free.mdwn
+++ b/jwz-free.mdwn
@@ -1,3 +1,3 @@
 This feed omits posts by jwz. Just 'cause.
 
-[[inline pages="internal(feeds/*) and !feeds and !feeds/jamie_zawinski/* and !*/Discussion" show="20"]]
+[[inline pages="internal(feeds/*) and !feeds and !internal(feeds/jamie_zawinski/*) and !*/Discussion" show="20"]]
diff --git a/lowvolume.mdwn b/lowvolume.mdwn
index 58c2520..a25b1d3 100644
--- a/lowvolume.mdwn
+++ b/lowvolume.mdwn
@@ -1,4 +1,5 @@
 The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
 
-[[inline pages="internal(feeds/*) and !feeds and !feeds/jamie_zawinski/* and
-!feeds/richard_stallman/* and !*/Discussion" show="20"]]
+[[inline pages="internal(feeds/*) and !feeds and
+!internal(feeds/jamie_zawinski/*) and
+!internal(feeds/richard_stallman/*) and !*/Discussion" show="20"]]
diff --git a/rms-free.mdwn b/rms-free.mdwn
index 5493c22..8dc93e4 100644
--- a/rms-free.mdwn
+++ b/rms-free.mdwn
@@ -1,3 +1,4 @@
 This feed omits posts by rms. Just 'cause.
 
-[[inline pages="internal(feeds/*) and !feeds and !feeds/richard_stallman/* and !*/Discussion" show="20"]]
+[[inline pages="internal(feeds/*) and !feeds and
+!internal(feeds/richard_stallman/*) and !*/Discussion" show="20"]]

diff --git a/index.mdwn b/index.mdwn
index 2620820..f8cd8e4 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -3,5 +3,5 @@ The people behind the software in Debian. (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.
 
-[[inline pages="feeds/* and !feeds and !*/Discussion" show="20"]]
+[[inline pages="internal(feeds/*) and !feeds and !*/Discussion" show="20"]]
 
diff --git a/jwz-free.mdwn b/jwz-free.mdwn
index d0dbf7d..defc2a4 100644
--- a/jwz-free.mdwn
+++ b/jwz-free.mdwn
@@ -1,3 +1,3 @@
 This feed omits posts by jwz. Just 'cause.
 
-[[inline pages="feeds/* and !feeds and !feeds/jamie_zawinski/* and !*/Discussion" show="20"]]
+[[inline pages="internal(feeds/*) and !feeds and !feeds/jamie_zawinski/* and !*/Discussion" show="20"]]
diff --git a/lowvolume.mdwn b/lowvolume.mdwn
index a192fd6..58c2520 100644
--- a/lowvolume.mdwn
+++ b/lowvolume.mdwn
@@ -1,4 +1,4 @@
 The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
 
-[[inline pages="feeds/* and !feeds and !feeds/jamie_zawinski/* and
+\[[inline pages="internal(feeds/*) and !feeds and !feeds/jamie_zawinski/* and
 !feeds/richard_stallman/* and !*/Discussion" show="20"]]
diff --git a/rms-free.mdwn b/rms-free.mdwn
index 88f8ea2..5493c22 100644
--- a/rms-free.mdwn
+++ b/rms-free.mdwn
@@ -1,3 +1,3 @@
 This feed omits posts by rms. Just 'cause.
 
-[[inline pages="feeds/* and !feeds and !feeds/richard_stallman/* and !*/Discussion" show="20"]]
+[[inline pages="internal(feeds/*) and !feeds and !feeds/richard_stallman/* and !*/Discussion" show="20"]]

diff --git a/archives.mdwn b/archives.mdwn
deleted file mode 100644
index dbf80bd..0000000
--- a/archives.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-These archives only go back 10 posts per feed.
-
-[[inline pages="feeds/* and !feeds and !*/Discussion" archive="yes" quick=yes]]
\ No newline at end of file
diff --git a/index.mdwn b/index.mdwn
index 5de062c..2620820 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,7 @@
 The people behind the software in Debian. (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. Also, [[archives]].
+as well as a [[lowvolume]] feed that omits both posters.
 
 [[inline pages="feeds/* and !feeds and !*/Discussion" show="20"]]
 

diff --git a/index.mdwn b/index.mdwn
index 46dd135..5de062c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,7 @@
 The people behind the software in Debian. (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. Also, [[archives]].
+
 [[inline pages="feeds/* and !feeds and !*/Discussion" show="20"]]
 
-Or if you prefer, there's are [[jwz-free]] and [[rms-free]] versions,
-as well as a [[lowvolume]] feed that omits both. Also, [[archives]].

diff --git a/index.mdwn b/index.mdwn
index 1c660de..46dd135 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,4 +2,5 @@ The people behind the software in Debian. (List of [[feeds]]).
 
 [[inline pages="feeds/* and !feeds and !*/Discussion" show="20"]]
 
-Or if you prefer, there's are [[jwz-free]] and [[rms-free]] versions. Also, [[archives]].
+Or if you prefer, there's are [[jwz-free]] and [[rms-free]] versions,
+as well as a [[lowvolume]] feed that omits both. Also, [[archives]].
diff --git a/jwz-free.mdwn b/jwz-free.mdwn
index cdbfd87..d0dbf7d 100644
--- a/jwz-free.mdwn
+++ b/jwz-free.mdwn
@@ -1,3 +1,3 @@
-The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
+This feed omits posts by jwz. Just 'cause.
 
-[[inline pages="feeds/* and !feeds and !feeds/jamie_zawinski/* and !*/Discussion" show="20"]]
\ No newline at end of file
+[[inline pages="feeds/* and !feeds and !feeds/jamie_zawinski/* and !*/Discussion" show="20"]]
diff --git a/lowvolume.mdwn b/lowvolume.mdwn
new file mode 100644
index 0000000..a192fd6
--- /dev/null
+++ b/lowvolume.mdwn
@@ -0,0 +1,4 @@
+The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
+
+[[inline pages="feeds/* and !feeds and !feeds/jamie_zawinski/* and
+!feeds/richard_stallman/* and !*/Discussion" show="20"]]
diff --git a/rms-free.mdwn b/rms-free.mdwn
index 088f8e5..88f8ea2 100644
--- a/rms-free.mdwn
+++ b/rms-free.mdwn
@@ -1,3 +1,3 @@
-The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
+This feed omits posts by rms. Just 'cause.
 
 [[inline pages="feeds/* and !feeds and !feeds/richard_stallman/* and !*/Discussion" show="20"]]

diff --git a/rms-free.mdwn b/rms-free.mdwn
new file mode 100644
index 0000000..088f8e5
--- /dev/null
+++ b/rms-free.mdwn
@@ -0,0 +1,3 @@
+The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
+
+[[inline pages="feeds/* and !feeds and !feeds/richard_stallman/* and !*/Discussion" show="20"]]

diff --git a/index.mdwn b/index.mdwn
index 03ec7a0..1c660de 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,4 +2,4 @@ The people behind the software in Debian. (List of [[feeds]]).
 
 [[inline pages="feeds/* and !feeds and !*/Discussion" show="20"]]
 
-Or if you prefer, there's a [[jwz-free]] version. Also, [[archives]].
\ No newline at end of file
+Or if you prefer, there's are [[jwz-free]] and [[rms-free]] versions. Also, [[archives]].

diff --git a/feeds.mdwn b/feeds.mdwn
index 5f37bc7..d513e49 100644
--- a/feeds.mdwn
+++ b/feeds.mdwn
@@ -39,6 +39,7 @@ 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="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/rss" 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]]
 

diff --git a/feeds.mdwn b/feeds.mdwn
index 5f37bc7..e56ba95 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="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="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]]
 * [[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]]

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..06399ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.ikiwiki
+feeds

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 251cb2f..fbd615f 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,5 +1,7 @@
 This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
+Testing 1.2.3..
+
 ----
 
 Here's a paragraph.

diff --git a/templates/note.mdwn b/templates/note.mdwn
deleted file mode 100644
index 7eb1749..0000000
--- a/templates/note.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="notebox">
-<TMPL_VAR text>
-</span>
\ No newline at end of file

diff --git a/archives.mdwn b/archives.mdwn
new file mode 100644
index 0000000..dbf80bd
--- /dev/null
+++ b/archives.mdwn
@@ -0,0 +1,3 @@
+These archives only go back 10 posts per feed.
+
+[[inline pages="feeds/* and !feeds and !*/Discussion" archive="yes" quick=yes]]
\ No newline at end of file
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..8f4e75c
Binary files /dev/null and b/favicon.ico differ
diff --git a/feeds.mdwn b/feeds.mdwn
new file mode 100644
index 0000000..5f37bc7
--- /dev/null
+++ b/feeds.mdwn
@@ -0,0 +1,44 @@
+This page configures the feeds that appear on the planet. Edit the page to add or modify feeds.
+
+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 about the lives and thoughts of upsteam authors.
+
+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="Alan Cox" tag="linux" url="http://lxorguk.ukuu.org.uk/" feedurl="http://lxorguk.ukuu.org.uk/rss.xml"]]
+* [[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="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]]
+* [[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="Blake Ross" tag="firefox" url="http://blakeross.com/" feedurl="http://blakeross.com/wp-rss2.php" 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="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="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="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" 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]]
+* [[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="Jim Gettys" tag="xorg" url="http://www.gettysfamily.org/wordpress/" feedurl="http://www.gettysfamily.org/wordpress/?feed=rss2" 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="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" 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="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="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="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" 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="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" 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="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]]
+
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..03ec7a0
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,5 @@
+The people behind the software in Debian. (List of [[feeds]]).
+
+[[inline pages="feeds/* and !feeds and !*/Discussion" show="20"]]
+
+Or if you prefer, there's a [[jwz-free]] version. Also, [[archives]].
\ No newline at end of file
diff --git a/jwz-free.mdwn b/jwz-free.mdwn
new file mode 100644
index 0000000..cdbfd87
--- /dev/null
+++ b/jwz-free.mdwn
@@ -0,0 +1,3 @@
+The lower-post-volume people behind the software in Debian. (List of [[feeds]].)
+
+[[inline pages="feeds/* and !feeds and !feeds/jamie_zawinski/* and !*/Discussion" show="20"]]
\ No newline at end of file
diff --git a/sandbox.mdwn b/sandbox.mdwn
new file mode 100644
index 0000000..251cb2f
--- /dev/null
+++ b/sandbox.mdwn
@@ -0,0 +1,34 @@
+This is the SandBox, a page anyone can edit to learn how to use the wiki.
+
+----
+
+Here's a paragraph.
+
+Here's another one with *emphasised* text.
+
+# Header
+
+## Subheader
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+> Back to the first level.
+
+Numbered list 
+
+1. First item.
+1. Another.
+1. And another..
+
+Bulleted list
+
+* *item*
+* item
+
+[[WikiLink]]
+
+foobar
\ No newline at end of file
diff --git a/templates/note.mdwn b/templates/note.mdwn
new file mode 100644
index 0000000..7eb1749
--- /dev/null
+++ b/templates/note.mdwn
@@ -0,0 +1,3 @@
+<span class="notebox">
+<TMPL_VAR text>
+</span>
\ No newline at end of file
diff --git a/trunk/archives.mdwn b/trunk/archives.mdwn
deleted file mode 100644
index dbf80bd..0000000
--- a/trunk/archives.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-These archives only go back 10 posts per feed.
-
-[[inline pages="feeds/* and !feeds and !*/Discussion" archive="yes" quick=yes]]
\ No newline at end of file
diff --git a/trunk/favicon.ico b/trunk/favicon.ico
deleted file mode 100644
index 8f4e75c..0000000
Binary files a/trunk/favicon.ico and /dev/null differ
diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
deleted file mode 100644
index 5f37bc7..0000000
--- a/trunk/feeds.mdwn
+++ /dev/null
@@ -1,44 +0,0 @@
-This page configures the feeds that appear on the planet. Edit the page to add or modify feeds.
-
-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 about the lives and thoughts of upsteam authors.
-
-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="Alan Cox" tag="linux" url="http://lxorguk.ukuu.org.uk/" feedurl="http://lxorguk.ukuu.org.uk/rss.xml"]]
-* [[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="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]]
-* [[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="Blake Ross" tag="firefox" url="http://blakeross.com/" feedurl="http://blakeross.com/wp-rss2.php" 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="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="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="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" 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]]
-* [[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="Jim Gettys" tag="xorg" url="http://www.gettysfamily.org/wordpress/" feedurl="http://www.gettysfamily.org/wordpress/?feed=rss2" 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="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" 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="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="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="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" 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="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" 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="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]]

(Diff truncated)

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index 6235c7a..5f37bc7 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -27,6 +27,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Jim Gettys" tag="xorg" url="http://www.gettysfamily.org/wordpress/" feedurl="http://www.gettysfamily.org/wordpress/?feed=rss2" 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="Joe Wreschnig" tag="quodlibet" url="http://piman.livejournal.com/" feedurl="http://piman.livejournal.com/data/rss" 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="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="Malte Timmermann" tag="openoffice" url="http://blogs.sun.com/roller/page/malte" feedurl="http://blogs.sun.com/roller/rss/malte" expirecount=10]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index a33a411..6235c7a 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -35,7 +35,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="Raph Levien" tag="ghostscript" feedurl="http://www.advogato.org/person/raph/rss.xml" url="http://www.advogato.org/person/raph/" expirecount=10]]
-* [[aggregate name="Robert Love" tag="linux" url="http://rlove.org/log/" feedurl="http://rlove.org/log/?flav=rss" 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="Tuomo Valkonen" tag="ion" url="http://modeemi.cs.tut.fi/~tuomov/b/" feedurl="http://modeemi.cs.tut.fi/~tuomov/b/rss.xml" expirecount=10]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index cb8241e..a33a411 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -38,7 +38,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Robert Love" tag="linux" url="http://rlove.org/log/" feedurl="http://rlove.org/log/?flav=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="Ted Tso" tag="e2fsprogs" tag="linux" url="http://www.livejournal.com/users/tytso/" feedurl="http://www.livejournal.com/users/tytso/data/rss" 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]]
 

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index a2ca7c7..cb8241e 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -23,7 +23,6 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" 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]]
 * [[aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
-* [[aggregate name="ikiwiki" tag="ikiwiki" url="http://ikiwiki.info/" feedurl="http://ikiwiki.info/news/index.rss" expirecount=10]]
 * [[aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://jwz.livejournal.com/" feedurl="http://jwz.livejournal.com/rss" expirecount=10]]
 * [[aggregate name="Jim Gettys" tag="xorg" url="http://www.gettysfamily.org/wordpress/" feedurl="http://www.gettysfamily.org/wordpress/?feed=rss2" 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]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index cb8241e..a2ca7c7 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -23,6 +23,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" 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]]
 * [[aggregate name="Harald Welte" tag="linux" tag="iptables" url="http://gnumonks.org/~laforge/weblog/" expirecount=10]]
+* [[aggregate name="ikiwiki" tag="ikiwiki" url="http://ikiwiki.info/" feedurl="http://ikiwiki.info/news/index.rss" expirecount=10]]
 * [[aggregate name="Jamie Zawinski" tag="xdaliclock" url="http://jwz.livejournal.com/" feedurl="http://jwz.livejournal.com/rss" expirecount=10]]
 * [[aggregate name="Jim Gettys" tag="xorg" url="http://www.gettysfamily.org/wordpress/" feedurl="http://www.gettysfamily.org/wordpress/?feed=rss2" 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]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index 94111b6..cb8241e 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -17,7 +17,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Blake Ross" tag="firefox" url="http://blakeross.com/" feedurl="http://blakeross.com/wp-rss2.php" 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="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"]]
+* [[aggregate name="Damien Sandras" tag="ekiga" url="http://blog.ekiga.net/" feedurl="http://blog.ekiga.net/?feed=rss2" 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="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" expirecount=10]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index e81fc9d..94111b6 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -17,7 +17,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Blake Ross" tag="firefox" url="http://blakeross.com/" feedurl="http://blakeross.com/wp-rss2.php" 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="Chip Salzenberg" tag="perl" url="http://use.perl.org/~chip/journal" feedurl="http://use.perl.org/~chip/journal/rss" expirecount=10]]
-* \["Damien: new feed (0 posts)
+* [[aggregate name="Damien Sandras" tag="ekiga" url="http://blog.ekiga.net/" feedurl="http://blog.ekiga.net/?feed=rss2"]]
 * [[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="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" expirecount=10]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index 1a66aab..e81fc9d 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -17,6 +17,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Blake Ross" tag="firefox" url="http://blakeross.com/" feedurl="http://blakeross.com/wp-rss2.php" 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="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"]]
 * [[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="Eric Raymond" tag="intercal" url="http://esr.ibiblio.org/" feedurl="http://esr.ibiblio.org/?feed=rss2" expirecount=10]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index 0f2f8a0..1a66aab 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -13,6 +13,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[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]]
+* [[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="Blake Ross" tag="firefox" url="http://blakeross.com/" feedurl="http://blakeross.com/wp-rss2.php" 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="Chip Salzenberg" tag="perl" url="http://use.perl.org/~chip/journal" feedurl="http://use.perl.org/~chip/journal/rss" expirecount=10]]

diff --git a/trunk/sandbox.mdwn b/trunk/sandbox.mdwn
index 88f1b42..251cb2f 100644
--- a/trunk/sandbox.mdwn
+++ b/trunk/sandbox.mdwn
@@ -31,4 +31,4 @@ Bulleted list
 
 [[WikiLink]]
 
-foo
\ No newline at end of file
+foobar
\ No newline at end of file

diff --git a/trunk/sandbox.mdwn b/trunk/sandbox.mdwn
new file mode 100644
index 0000000..88f1b42
--- /dev/null
+++ b/trunk/sandbox.mdwn
@@ -0,0 +1,34 @@
+This is the SandBox, a page anyone can edit to learn how to use the wiki.
+
+----
+
+Here's a paragraph.
+
+Here's another one with *emphasised* text.
+
+# Header
+
+## Subheader
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+> Back to the first level.
+
+Numbered list 
+
+1. First item.
+1. Another.
+1. And another..
+
+Bulleted list
+
+* *item*
+* item
+
+[[WikiLink]]
+
+foo
\ No newline at end of file

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index 0dc97b8..0f2f8a0 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -34,6 +34,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Lennart Poettering" tag="avahi" tag="pulseaudio" url="http://0pointer.de/blog/" feedurl="http://0pointer.de/blog/index.rss2" 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="Robert Love" tag="linux" url="http://rlove.org/log/" feedurl="http://rlove.org/log/?flav=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="Ted Tso" tag="e2fsprogs" tag="linux" url="http://www.livejournal.com/users/tytso/" feedurl="http://www.livejournal.com/users/tytso/data/rss" 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]]

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index a3bbca4..0dc97b8 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -38,3 +38,4 @@ Be sure to add tags for the software packages that people maintain.
 * [[aggregate name="Ted Tso" tag="e2fsprogs" tag="linux" url="http://www.livejournal.com/users/tytso/" feedurl="http://www.livejournal.com/users/tytso/data/rss" 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]]
+

diff --git a/trunk/index/discussion.mdwn b/trunk/index/discussion.mdwn
deleted file mode 100644
index 1df41c2..0000000
--- a/trunk/index/discussion.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Wooden Cedar Shoe Trees Manufacturer - China Toplevel Co.,Limited
-http://www.xanga.com/shoetrees , http://www.xanga.com/shoetree , http://www.toplevel.net.cn
\ No newline at end of file

diff --git a/trunk/feeds/Aaron_Siego/7th_umeet.html b/trunk/feeds/Aaron_Siego/7th_umeet.html
deleted file mode 100644
index bbb6ebe..0000000
--- a/trunk/feeds/Aaron_Siego/7th_umeet.html
+++ /dev/null
@@ -1,14 +0,0 @@
-i did a presentation for the 7th <a href="http://umeet.uninet.edu/umeet2006/english/pres.html">umeet conference</a>. best part was that i didn't have to change out of my jammies to do it since it's an online conference held on irc. no travel time, no huge impositions on my schedule ... perfect! =) i "spoke" about kde4, generally working off my kde4 presentation slides.<br/>
-<br/>they have a really nice <a href="http://umeet.uninet.edu/umeet2006/english/prog.html">line up of speakers</a> from all over the world this year. rik van riel opened things up on tuesday, duncan mac-vicar will be speaking on sunday about kopete and rms will be speaking tuesday. the presentations are interactive: you can ask questions in the questions channel and the speaker answers them at their leisure and discretion. they post irc logs and slides (if any) on the site so you can read them whenever.<br/>
-<br/>i look forward to next year's umeet when i can talk about the upcoming kde 4.1 ;)
-
-[[tag kde]]
-
-
-[[meta title="7th umeet"]]
-
-
-[[meta permalink="http://aseigo.blogspot.com/2006/12/7th-umeet.html"]]
-
-[[meta author="Aaron Siego"]]
-[[meta authorurl="http://aseigo.blogspot.com/"]]
diff --git a/trunk/feeds/Aaron_Siego/KMultiActionButton.html b/trunk/feeds/Aaron_Siego/KMultiActionButton.html
deleted file mode 100644
index aa96349..0000000
--- a/trunk/feeds/Aaron_Siego/KMultiActionButton.html
+++ /dev/null
@@ -1,12 +0,0 @@
-inspired by the "grouped actions" toolbar widgets in vista and macos i figured i'd try my hand at doing something similar with qt4. the results are currently less than inspiring visually:<br /><br /><div align="center" style="margin: 6px; padding: 6px; border: 1px solid grey;"><img src="http://bddf.ca/~aseigo/actionbutton.png" width=200 height=32 title="action button ... away!"></div><br /><br />the neat thing is that it mimics the api for <a href="http://doc.trolltech.com/4.2/qtoolbar.html">qtoolbar</a> so you can simply sling actions at it and they show up grouped:<br /><br /><blockquote><code>    KMultiActionButton* button = new KMultiActionButton(window);<br />    button->addAction( icon1, i18n("Quit"), qApp, SLOT( quit() ));<br />    QAction* action = button->addAction( icon2, "action 2", );<br />    connect(action, SIGNAL(triggered(bool)), this, SLOT(someSlot()));<br /><br />    button->addAction( KStdAction::close( mainWindow, SLOT( close() ), actionCollection() ) );<br /><br />    toolbar->addWidget(button);<br /></code></blockquote><br /><br />i still have to implement things like showing menus for actions that have them and respecting action groups (not to mentioned seriously working on the currently crapitudinal eye candy), but i'm interested in feedback from other developers before i spend to much time on it. if you have a Qt4 or KDE4 app (there are currently no KDE dependencies in the class) and would like something like this in your app, please let me know as i'm looking for some guinea pigs, er, test cases before attempting to inflict this upon libkdeui ;)<br /><br />p.s. no, i'm not trying to replace devel mailing lists with blogs: i've also sent an email off to kde-core-devel, but not all app devels read that.
-
-[[tag kde]]
-
-
-[[meta title="KMultiActionButton"]]
-
-
-[[meta permalink="http://aseigo.blogspot.com/2006/12/kmultiactionbutton.html"]]
-
-[[meta author="Aaron Siego"]]
-[[meta authorurl="http://aseigo.blogspot.com/"]]
diff --git a/trunk/feeds/Aaron_Siego/calgary_unix_user__39__s_group.html b/trunk/feeds/Aaron_Siego/calgary_unix_user__39__s_group.html
deleted file mode 100644
index 0e57326..0000000
--- a/trunk/feeds/Aaron_Siego/calgary_unix_user__39__s_group.html
+++ /dev/null
@@ -1,15 +0,0 @@
-this evening at 17:30 i'll be speaking at the <a href="http://www.cuug.ab.ca/">calgary unix users group</a> on the topic of "open source desktop software directions". come on out and join the party if you can, it'll be good. the presentation is at the public library downtown (check the cuug site for more info) and i'm sure we'll be visting bottlescrew bill's afterwards. there's a bit of an entry fee to get in, but that's used to bring food and drinks in for everyone and generally support cuug.<br/>
-<br/>i'll be trying out some new material that casts some analysis on the foss desktop community, market and industry before launching into a "status of the kde4" review. so it should be interesting.<br/>
-<br/>i wonder if the novell guy who visited the <a href="http://clug.ca/">calgary linux  users group</a> last week will be there. probably not, but it would be fun and probably fair play. he presented on novell's new deal with microsoft and attempted to completely by-pass the whole patent agreement issue by not even mentioning it in the presentation, despite that being one of the two major issues people have with the deal. the other issue (openxml) also got short shrift. fortunately i was there. ;) if he does come to cuug tonight he could play critic to my thoughts on the state of our collective efforts. while i won't be talking about the novell/ms deal at all i'm sure there are several points of interest in the presentation for him.<br/>
-<br/>and once i'm done the new slides (finishing them up now) i think i'm going to toddle over to kde4 dolphin for a bit. =)
-
-[[tag kde]]
-
-
-[[meta title="calgary unix user&#39;s group"]]
-
-
-[[meta permalink="http://aseigo.blogspot.com/2006/12/calgary-unix-users-group.html"]]
-
-[[meta author="Aaron Siego"]]
-[[meta authorurl="http://aseigo.blogspot.com/"]]
diff --git a/trunk/feeds/Aaron_Siego/developer_wiki_fridays.html b/trunk/feeds/Aaron_Siego/developer_wiki_fridays.html
deleted file mode 100644
index 4db392d..0000000
--- a/trunk/feeds/Aaron_Siego/developer_wiki_fridays.html
+++ /dev/null
@@ -1,46 +0,0 @@
-monday is my day for kdelibs adjustments, and now friday has become my day to help with the new kde developer wiki. sort of like bookends to my week. i'll be doing developer wiki fridays until at least the end of january. maybe longer, but we'll see.<br/>
-<br/>what is this developer wiki i speak of? it's the replacement for the somewhat haphazzard <a href="http://developer.kde.org">developer.kde.org</a>. the new approach is to use a wiki so everyone can participate. it's looking pretty good so far, as you can <a href="http://developernew.kde.org">see for yourself</a>.<br/>
-<br/>however, there are challenges ahead.<br/>
-<br/>
-<h3>centralizing our content</h3>
-<br/>
-<br/>right now you can find developer documentation scattered across the internet on various servers. for instance, there's some really great content on the <a href="http://women.kde.org/articles/tutorials.php">kde women tutorials page</a>, there's some articles on ibm's developerworks site, while an article on how to <a href="http://developer.kde.org/language-bindings/ruby/index.html">get started with the ruby bindings</a> is hidden under the ever descriptive "bindings" entry on the sidebar on developer.kde.org. there's also a large number of tutorials hosted on people's personal webservers.<br/>
-<br/>sweeping all these altogether is no mean feat. perhaps we shouldn't even bother doing this with older content, due to the time it would take and dealing with other people's links and bookmarks to the content. it's a lot of work.<br/>
-<br/>at the very least we need to make the wiki the natural and first choice of authors of future works.<br/>
-<br/>
-<h3>porting old documentation</h3>
-<br/>
-<br/>i spent some time today sorting out kde2, kde3 and kde4 appropriate tutorials on to different pages. right now the idea is to make kde4 the primary focus of the site while keeping the older materials around for reference but in their own area of the site. unfortunately, there's very very little high-level documentation for kde4. sure, we've got the usual great API documentation but that's not a good way for people to learn how to actually write kde applications. that's what tutorials are for.<br/>
-<br/>there are numerous technologies that kde4 is inheriting from kde3. if you look at the page of <a href="http://developernew.kde.org/Development/Tutorials/KDE3">kde3 tutorials</a> and compare them with the <a href="http://developernew.kde.org/Development/Tutorials">kde4 tutorials</a> you'll notice that there's a lot less content. and even the kde3 tutorial are hardly comprehensive. many of the kde3 tutorials simply need to be gone through and "ported" to kde4. some, such as the xmlgui tutorial, probably aren't worth spending energy on right now as liveui looks like it will take its place now that people are working on it again.<br/>
-<br/>
-<h3>kde4 documentation</h3>
-<br/>
-<br/>we also have lots of cool new technologies in kde4. several of them are already usable by application developers, such as solid and phonon. we need to get tutorials for these technologies, starting with the basic concepts (e.g. a survey of the classes in solid) with other tutorials covering more advanced or specific topics (e.g. "embedding videos with phonon")<br/>
-<br/>of course, there's also the holes that exist in our current tutorials. for example, we have a good tutorial on kconfigxt, but nothing on using kconfig itself.<br/>
-<br/>we need to start writing these texts. they don't have to be long or overly complicated. even a single page article helps, sometimes a lot.<br/>
-<br/>
-<h3>other useful bits</h3>
-<br/>
-<br/>of course, it's not all about documentation. there's an <a href="http://developernew.kde.org/ISV">area for ISVs</a>, for instance, that's mostly content-free at the moment and what is there is already a bit dated. i think there's work here for the kde promo team.<br/>
-<br/>
-<h3>developer wiki fridays</h3>
-<br/>
-<br/>wouldn't it be nice if we couldn't list all the tutorials on the main tutorial page but had to break them up into separate pages because there were so many? wouldn't it be nice if our high level documentation covered enough of kde that people could use that material to create lesson plans around it and teach kde development in classrooms? =) we <i>can</i> do it! <br/>
-<br/>our developer documentation is an important pathway to getting new developers and supporting those that we have today.<br/>
-<br/>if you'd like to join me on fridays working on this, hunt me down on irc so we can coordinate a bit and keep each other company. if you'd like to start writing content or porting older tutorials, please don't wait for friday ... start whenever you can =)<br/>
-<br/>
-<h3>credit where credit is due</h3>
-<br/>
-<br/>the new wiki was not my idea or the results of my efforts. daniel molkentin and dominik haumann have been pushing this forward with sys admin tasks being performed by dirk mueller and artwork coming from nuno pinheiro and luke parry. there are probably others who have dipped their fingers into the wiki sauce as well. they all deserve a big "thank you!" for getting this started. they also deserve our help in making this the success we all would like it to be.<br/>
-<br/>p.s. a sysadmin.kde.org site with a similar approach that started with the content from the <a href="http://www.kde.org/areas/sysadmin/">kde.org sysadmin area</a> would be nice, too.
-
-[[tag kde]]
-
-
-[[meta title="developer wiki fridays"]]
-
-
-[[meta permalink="http://aseigo.blogspot.com/2006/12/developer-wiki-fridays.html"]]
-
-[[meta author="Aaron Siego"]]
-[[meta authorurl="http://aseigo.blogspot.com/"]]
diff --git a/trunk/feeds/Aaron_Siego/kde_for_teachers.html b/trunk/feeds/Aaron_Siego/kde_for_teachers.html
deleted file mode 100644
index 3444f4b..0000000
--- a/trunk/feeds/Aaron_Siego/kde_for_teachers.html
+++ /dev/null
@@ -1,20 +0,0 @@
-with so much emphasis on getting linux to children, particularly students, one might think there would be nearly as many (maybe more) efforts to get free(dom) software to teachers. they are an important group of people because they teach our children, often with far too few resources given them to accomplish this task. even in the "first world" this is often the case: the school p. goes to has had to fall back on corporate sponsorship deals and still teachers dip into personal funds for classroom supplies. perhaps as poignantly: if we don't have tools of freedom in our institutions of learning how can we ever expect those learning there to understand the benefits and principles of freedom?<br/>
-<br/>it was refreshing to speak with K.K. Subbu while in bangalore, india as he recounted one story of bringing free software to teachers. his opinion, shared by many in the area apparently, is that for students in the rural schools computers just aren't the best teaching device. they are great tools for the teachers, but nothing can replace the teacher themselves in their classrooms. so the NGO Subbu is volunteering in has instead been looking at how to make teachers more efficient and naturally they are looking to free software to help them accomplish this.<br/>
-<br/>it started when a retired professor walked into a Kanakapura elementary school and told them he'd like to help out however he could. one of the challenges he (and later his group of volunteers) uncovered was the teacher's efforts to meet the requirement for students to be assessed three times per year. unlike the annual standardized test, these assessments were to be specific to the school as different schools progress at different rates making standardized testing not realistic. ("no child left behind" might learn something from that statement...)<br/>
-<br/>now, creating tests are part of what a teacher does all the time. but these were particularly inconvenient. they needed to created tests for 4-5 subjects and had to do them on a computer. most used, or rather struggled with, microsoft word to lay out the tests and then they would need to get a master printed out. this would cost them around 40 rupees per test (20 rupees per page, and a two page test). they were rarely happy with the results given word's limited layout capabilities but it was all most had access to and knowledge of. some of the teachers would instead purchase a master from a regional school board and save 50-75%, though the test would no longer be customized to their class. either way, the process meant travel time and would take about a week from start to finish. with the master copy in hand, the teacher would then have to make copies which would cost a rupee or two per test copy.<br/>
-<br/>enter kde and kile.<br/>
-<br/>the volunteers started training teachers to use <a href="http://kile.sourceforge.net/">kile</a> and gave them computers with a locked-down kde on it. the flexibility and completeness of <a href="http://www.kde.org/areas/sysadmin">kiosk</a> was a primary reason for using kde and kile was simply perfect for their layouting needs. now these same teachers can simply write their test content and it's professionally laid out, turned into a print-ready pdf which they send to a digital printer. using the dvi format they can actually measure items on the screen with a ruler to make sure things are just right removing the need for a master print. the total cost is now less than half a rupee per test with no master copy cost. they are also able to make up to two tests per day.<br/>
-<br/>who can argue with lower costs and saved time? not these teachers. and so now this group has adopted 50 schools with some 200 teachers. they have only just begun as the state they are in has some 48,000 elementary schools that provide classes for over 8,000,000 students. just imagine the potential savings in both time and money!<br/>
-<br/>and of course the teachers who are using these kde systems have been poking around the computer and finding some of the other great pieces of software that came with the systems.<br/>
-<br/>you can read more about this project at the <a href="http://sikshana.blogspot.com/">sikshana blog</a>. which reminds me, i promised Subbu i'd introduce him and the kile developers since they have some feedback for them, not to mention a few notes of thanks. =)
-
-[[tag kde]]
-
-
-[[meta title="kde for teachers"]]
-
-
-[[meta permalink="http://aseigo.blogspot.com/2006/12/kde-for-teachers.html"]]
-
-[[meta author="Aaron Siego"]]
-[[meta authorurl="http://aseigo.blogspot.com/"]]
diff --git a/trunk/feeds/Aaron_Siego/monday_is_libs_day.html b/trunk/feeds/Aaron_Siego/monday_is_libs_day.html
deleted file mode 100644
index 1871d40..0000000
--- a/trunk/feeds/Aaron_Siego/monday_is_libs_day.html
+++ /dev/null
@@ -1,28 +0,0 @@
-monday is the day when we're allowed to muck with kdelibs in ways that makes people recompile. the last couple mondays i've been taking advantage of that in an attempt to bring some order to kdelibs. we started this in norway at the kde4core meeting, but then we got back to the usual order of "hack on this" and "hack on that". or in my case "travel here", "deal with business X", "write N emails", "hack on this", "travel there", etc... well, the work needs to be done and monday's the day to do it. <br/>
-<br/>david faure has also been busy on with the monday commits as he works on the kdecore/kdeui split such that kdecore will one day link only against non-UI libraries. this means, just as with libqtcore, you can use these classes from non-graphical apps. who needs x11 anyways ;)<br/>
-<br/>anyways, if you're looking for me on irc on mondays for the next while don't expect me to be overly responsive. i'm around, but probably busy with moving things around in kdelibs.<br/>
-<br/>i did move KActiveLabel into kde3support (the library full of deprecated stuff we'll one day get rid of completely but are keeping around to make life easier for people porting apps). what to do with your code that was using KActiveLabel, you ask? let me quote from the kde4 porting guide:<br/>
-<br/>
-<blockquote>"Use QLabel instead. This class was moved to kde3support as K3ActiveLabel.<br/>
-<ul>
-<br/>
-<li>QLabel::setOpenExternalLinks(true) for labels with hyperlinks.</li>
-<br/>
-<li>QLabel::setTextInteractionFlags(Qt::TextSelectableByMouse|Qt::TextSelectableByKeyboard) for labels whose text should be selectable by user.</li>
-<br/>
-</ul>"</blockquote>
-<br/>
-<br/>tomorrow it's on to other things. my todo list is huge right now, but i figure if i eat it one bite at a time the elephant will eventually be consumed.<br/>
-<br/>i'm very happy with what is happening with kde promo right now and have stepped back from having too much to do with it for the time being. i'm also stepping back from visits to airports for the next several months as well. this should give me the room i need. not that i'll be staying still: i've already started a number of balls rolling, but this time almost exclusively on the development front. will be interesting to see where they all land.<br/>
-<br/>so the next few months will consist of quiet days at home with the computer, cats and coffee. who needs anything more? well, besides food, love and water of course. ;)
-
-[[tag kde]]
-
-
-[[meta title="monday is libs day"]]
-
-
-[[meta permalink="http://aseigo.blogspot.com/2006/12/monday-is-libs-day.html"]]
-
-[[meta author="Aaron Siego"]]
-[[meta authorurl="http://aseigo.blogspot.com/"]]
diff --git a/trunk/feeds/Aaron_Siego/multiple_actions_in_toolbars__44___take_2.html b/trunk/feeds/Aaron_Siego/multiple_actions_in_toolbars__44___take_2.html
deleted file mode 100644
index dd4ea75..0000000
--- a/trunk/feeds/Aaron_Siego/multiple_actions_in_toolbars__44___take_2.html
+++ /dev/null
@@ -1,29 +0,0 @@
-one of the bits of feedback i got fro my last blog entry on <a href="http://aseigo.blogspot.com/2006/12/kmultiactionbutton.html">kmultiactionbutton</a> is that it might be possible to do this via the style itself. this would be preferred since it would mean every app could take advantage of it with less special code. the <a href="http://baghira.sourceforge.net/">baghira style</a> for kde3 does this, for instance, but it does so with some pain and some hacks. in fact, there is this cute comment in the sources at the relevant point:<br/>
-<br/>
-<blockquote>this is crap at all - so if the best thing would be to patch qtoolbutton to provide conjuncted buttons - i'll ask them (maybe qt4)</blockquote>
-<br/>
-<br/>dude, i feel your pain.<br/>
-<br/>looking at qt4, we obviously don't have support for conjoined buttons. or ... do we? enter <a href="http://doc.trolltech.com/4.2/qactiongroup.html">QActionGroup</a>! according to the documentation:<br/>
-<br/>
-<blockquote>In some situations it is useful to group actions together. For example, if you have a Left Align action, a Right Align action, a Justify action, and a Center action, only one of these actions should be active at any one time. One simple way of achieving this is to group the actions together in an action group.</blockquote>
-<br/>
-<br/>exclusivity is optional in an actiongroup, and so this gives us what looks like a nice generic way to denote "these actions belong together". with a bit of trickery in the style, more reliable than what baghira was able to accomplish with qt3, we should be able to detect buttons on a toolbar that are next to each other and belong to the same action group.<br/>
-<br/>the application code might look like:<br/>
-<br/>
-<blockquote>
-<code>QActionGroup* group = new QActionGroup(this);<br/>new QAction(i18n("Some Action"), group);<br/>new QAction(i18n("Another Action"), group);<br/>toolbar-&gt;insertActions(group-&gt;actions());</code>
-</blockquote>
-<br/>
-<br/>sadly for the style code, the QStyleOptionToolButton class doesn't note which action group (if any) an action belongs to and so we'd need to do a bunch of casting and parent/child traversing. even if it did contain some info on the action pointer, it would only work for toolbuttons (as opposed to any/all widgets) and the style would still need to know what the previous and next button's groups are (meaning wandering the parent/child tree a bit). and yes, we'd probably only check widget.actions().first() but that's an ok limitation.<br/>
-<br/>so, moral of the story is that perhaps we should start using QActionGroup, even when it's only used for semantic purposes. this might be something the liveui guys want to consider if they haven't as well since this ought to be part of our toolbar building technology (yes, i'm looking at you tronical and ervin ;)
-
-[[tag kde]]
-
-
-[[meta title="multiple actions in toolbars, take 2"]]

(Diff truncated)

diff --git a/trunk/feeds/Larry_Ewing/Authority.html b/trunk/feeds/Larry_Ewing/Authority.html
index ada90fe..41d3371 100644
--- a/trunk/feeds/Larry_Ewing/Authority.html
+++ b/trunk/feeds/Larry_Ewing/Authority.html
@@ -1,4 +1,4 @@
-<p><a href="http://rlove.org/log/">Robert</a> finally annouced his new postion.  Are you ready?<br />
+<p><a href="http://rlove.org/log/">Robert</a> finally annouced his new position.  Are you ready?<br />
 <a title="Photo Sharing" href="http://www.flickr.com/photos/lewing/178366781/" /></p>
 <div style="text-align: center"><a title="Photo Sharing" href="http://www.flickr.com/photos/lewing/178366781/"><img width="240" height="160" border="0" alt="IMG_3873.JPG" src="http://static.flickr.com/69/178366781_633bc675d4_m.jpg" /></a></div>
 
diff --git a/trunk/feeds/discussion.mdwn b/trunk/feeds/discussion.mdwn
deleted file mode 100644
index d6a6a41..0000000
--- a/trunk/feeds/discussion.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Manual Toothbrushes Manufacturer - Yangzhou Shuguang Toothbrush Factory
-http://www.xanga.com/sgtoothbrush , http://www.sunrisbrush.com , http://www.chinabboss.com , http://20six.co.uk/sgtoothbrush ,  http://www.xanga.com/sunrisebrush , http://sgtoothbrush.livejournal.com 
\ No newline at end of file

diff --git a/trunk/index/discussion/discussion.mdwn b/trunk/index/discussion/discussion.mdwn
deleted file mode 100644
index b405b3d..0000000
--- a/trunk/index/discussion/discussion.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Manual Toothbrushes Manufacturer - Yangzhou Shuguang Toothbrush Factory
-http://www.xanga.com/sgtoothbrush , http://www.sunrisbrush.com , http://www.chinabboss.com , http://20six.co.uk/sgtoothbrush ,  http://www.xanga.com/sunrisebrush , http://sgtoothbrush.livejournal.com 
\ No newline at end of file

diff --git a/trunk/feeds.mdwn b/trunk/feeds.mdwn
index 2c1ba49..a3bbca4 100644
--- a/trunk/feeds.mdwn
+++ b/trunk/feeds.mdwn
@@ -28,6 +28,7 @@ Be sure to add tags for the software packages that people maintain.
 * [[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="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="Miguel de Icaza" tag="gnome" tag="mono" url="http://tirania.org/blog/" feedurl="http://tirania.org/blog/miguel.rss2" 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]]
diff --git a/trunk/feeds/Miguel_de_Icaza/Paint__46__NET_and_SafeHandles.html b/trunk/feeds/Miguel_de_Icaza/Paint__46__NET_and_SafeHandles.html
index 5be7d4e..40b0abf 100644
--- a/trunk/feeds/Miguel_de_Icaza/Paint__46__NET_and_SafeHandles.html
+++ b/trunk/feeds/Miguel_de_Icaza/Paint__46__NET_and_SafeHandles.html
@@ -41,7 +41,8 @@
        the work.
 
        <p>So I ended up with half the code base amputated, and half
-       the code base semi-working.
+       the code base semi-working (semi-working because my wrapper
+       was not completed).
 
        <p><b>Emulation vs Refactoring: </b> In a handful of places I
        decided to implement small native wrappers that are
@@ -51,26 +52,33 @@
 
        <p>At the time, it made sense to emulate a handful of calls,
        and we also came up with a design for routing P/Invoke calls
-       done to USER32 to be forwarded to our managed library.   The
-       infrastructure is still in place and we could use it to
-       simplify the porting of applications.
-
-       <p>In retrospect, I should just have taken advantage that
-       Paint.NET actually had isolated the system-dependant code in
-       their SystemLayer library and just provide Unix alternatives,
-       instead of trying to run it out of the box. 
-
-       <p>Also, based on the <a
+       done to USER32 to be forwarded to our managed
+       <tt>System.Windows.Forms</tt> library.  The infrastructure is
+       still in place and we could use it to simplify the porting of
+       applications, but am still debating if this is a good idea or
+       not.
+
+       <p>In retrospect, I should just have taken advantage of
+       Paint.NET's architecture.  Paint.NET actually had isolated the
+       system-dependant code in their SystemLayer library, I could have
+       provided Unix alternatives in that library instead of trying
+       to emulate its underlying functionality (this was another part
+       where half the code was emulated, and half was worked
+       around). 
+
+       <p>Based on the <a
        href="http://primates.ximian.com/~miguel/momareports"</a>various
-       Moma Reports</a> it seems that we might be better served in
-       having a portability library that developers would use with
-       their application.  First, from the Moma reports that we have
-       obtained, we have noticed that some people are using incorrect
-       P/Invoke signatures.  So their software is broken and fragile,
-       and it only happens to work because the stars are properly
-       aligned, but it could break easily, or could have undesirable
-       effect easily (and this is on Windows!)
-
+       Moma Reports</a> it seems that we might be better served by
+       having a portability library that developers could use with
+       their application.
+
+       <p>From the Moma reports that people have submitted, we have
+       noticed that some people are using incorrect P/Invoke
+       signatures.  This means that their software is actually broken
+       and is probably fragile.  It only happens to work because this
+       month stars are properly aligned, but it could break easily,
+       or could have undesirable effects easily (and this is on
+       Windows!).
 
        <p>Second, there are some APIs that can be used for many
        different things, like "SendMessage".
@@ -115,7 +123,7 @@
        shell still needs some API calls to be implemented
        (TableLayout related code).
 
-       <p>Once those APIs are completed, is when the real porting
+       <p>Once those APIs are completed, the real porting
        work will begin.   That is when I will have to do the
        refactoring or provide a Unix-specific implementation of the
        SystemLayer API that Paint.NET uses.
diff --git a/trunk/feeds/Miguel_de_Icaza/Parameters_in_Properties.html b/trunk/feeds/Miguel_de_Icaza/Parameters_in_Properties.html
index 4fbae52..39453d2 100644
--- a/trunk/feeds/Miguel_de_Icaza/Parameters_in_Properties.html
+++ b/trunk/feeds/Miguel_de_Icaza/Parameters_in_Properties.html
@@ -1,6 +1,6 @@
 
        <p>C# allows an arbitrary number of parameters (similar to
-       varargs in C) in properties.   This looks like this: 
+       varargs in C) in indexer properties.   This looks like this: 
 
        <pre class="code-csharp">
    class Vector {
@@ -40,7 +40,7 @@
        a year ago, it was on my personal compiler TODO list for at
        least three years.
 
-       <p>This fix will be on Mono 1.2.3 or its available on SVN on r69571.
+       <p>This fix will be on Mono 1.2.3 or it's available on SVN on r69571.
 
 
 [[tag gnome]]
@@ -48,7 +48,7 @@
 [[tag mono]]
 
 
-[[meta title="Parameters in Properties"]]
+[[meta title="Parameters in Indexer Properties"]]
 
 
 [[meta permalink="http://tirania.org/blog/archive/2006/Dec-16.html"]]
diff --git a/trunk/feeds/Rusty_Russell/tcmalloc_and_the_C++_issue.html b/trunk/feeds/Rusty_Russell/tcmalloc_and_the_C++_issue.html
index d189d46..1a6a52c 100644
--- a/trunk/feeds/Rusty_Russell/tcmalloc_and_the_C++_issue.html
+++ b/trunk/feeds/Rusty_Russell/tcmalloc_and_the_C++_issue.html
@@ -1,6 +1,6 @@
 
-<p> From some blog (sorry, offline, no idea where) I found a reference
-to "tcmalloc", a faster-than-glibc-malloc threaded malloc
+<p> From <a href="http://www.stillhq.com/link/000136.html">Michael Still's blog</a> (via <a href="http://planet.linux.org.au">Planet Linux Australia</a>) I found a reference
+to <a href="http://goog-perftools.sourceforge.net/doc/tcmalloc.html">"tcmalloc"</a>, a faster-than-glibc-malloc threaded malloc
 implementation out of Google.  Reading the paper, it sounded good.
 </p>
 
diff --git a/trunk/feeds/Tuomo_Valkonen/An_evaluation_of_version_control_systems.html b/trunk/feeds/Tuomo_Valkonen/An_evaluation_of_version_control_systems.html
index e5c3789..8f7c937 100644
--- a/trunk/feeds/Tuomo_Valkonen/An_evaluation_of_version_control_systems.html
+++ b/trunk/feeds/Tuomo_Valkonen/An_evaluation_of_version_control_systems.html
@@ -152,7 +152,11 @@ way to build self-contained executables from packages already
 installed on a system.</p>
 
 <p><strong>3.</strong>
-Here's a summary of the various aspects discussed above, and some others:</p>
+To conclude and sum it up, I must say that presently all version control
+systems suck. The table below lists and scores the considered ones
+in the various criteria discussed above, and some others. 
+Any that first fulfills all of those and any other gripes I might come
+up with, I am likely t