diff --git a/blog/entry/hiking-oops.mdwn b/blog/entry/hiking-oops.mdwn
new file mode 100644
index 0000000..2f42335
--- /dev/null
+++ b/blog/entry/hiking-oops.mdwn
@@ -0,0 +1,13 @@
+Really, really windy day. There was a tornado watch until 3, which I didn't
+think much about until I was up on a ridge overlooping Slagle Hollow at
+3:30, in one of the strongest winds I've experienced, blowing small branches
+past me. And lost. That could have not turned out well, but I made the
+right guesses at the turns, and it gave me the incentive to power-hike for
+an hour to get down off the hill and back to Roosterfront.
+
+Before that I found a beautiful long hollow full of mossy deadfalls and
+trilliums, atonishingly close to the well-traveled trails.
+
+[[tag lay]]
+
+[[meta title="oops"]]
diff --git a/blog/entry/oops.mdwn2 b/blog/entry/oops.mdwn2
deleted file mode 100644
index 2f42335..0000000
--- a/blog/entry/oops.mdwn2
+++ /dev/null
@@ -1,13 +0,0 @@
-Really, really windy day. There was a tornado watch until 3, which I didn't
-think much about until I was up on a ridge overlooping Slagle Hollow at
-3:30, in one of the strongest winds I've experienced, blowing small branches
-past me. And lost. That could have not turned out well, but I made the
-right guesses at the turns, and it gave me the incentive to power-hike for
-an hour to get down off the hill and back to Roosterfront.
-
-Before that I found a beautiful long hollow full of mossy deadfalls and
-trilliums, atonishingly close to the well-traveled trails.
-
-[[tag lay]]
-
-[[meta title="oops"]]

diff --git a/blog/entry/oops.mdwn2 b/blog/entry/oops.mdwn2
new file mode 100644
index 0000000..2f42335
--- /dev/null
+++ b/blog/entry/oops.mdwn2
@@ -0,0 +1,13 @@
+Really, really windy day. There was a tornado watch until 3, which I didn't
+think much about until I was up on a ridge overlooping Slagle Hollow at
+3:30, in one of the strongest winds I've experienced, blowing small branches
+past me. And lost. That could have not turned out well, but I made the
+right guesses at the turns, and it gave me the incentive to power-hike for
+an hour to get down off the hill and back to Roosterfront.
+
+Before that I found a beautiful long hollow full of mossy deadfalls and
+trilliums, atonishingly close to the well-traveled trails.
+
+[[tag lay]]
+
+[[meta title="oops"]]

diff --git a/blog/entry/the_bridge.mdwn b/blog/entry/the_bridge.mdwn
new file mode 100644
index 0000000..dacedd0
--- /dev/null
+++ b/blog/entry/the_bridge.mdwn
@@ -0,0 +1,18 @@
+* 1 am, cautiuosly feeling my way through a construction site with a dim
+  flashlight, weird bits of metal on concrete, sticking to the center as
+  there are no guardrails. Suprised by a spot in the middle where the stars
+  are bright and clear.
+* Crossing the other way one day, since a train parked for an hour blocking
+  the road. It's nearly done except for the approaches, but I still nervously
+  look for police cars. View of Holston mountain.
+* Twilight yesterday, threatening to storm, and suddenly I realise there
+  are other pedestrians on the bridge ahead of me. Crossing over from
+  illicit to legit. Kids walking down the center line. Cerimonial tent in
+  the park.
+* Evening today and I only bring myself to walk over it with traffic
+  whizzing by because I know this is the last crossing that will be
+  special.
+* (A few days from now, in a car. Up and over. Another boring, 
+  [ugly concrete bridge](http://www.tricities.com/tristate/tri/news.apx.-content-articles-TRI-2008-05-10-0010.html).)
+
+[[tag lay]]

diff --git a/blog/entry/spamvertunity/discussion.mdwn b/blog/entry/spamvertunity/discussion.mdwn
new file mode 100644
index 0000000..dd2943c
--- /dev/null
+++ b/blog/entry/spamvertunity/discussion.mdwn
@@ -0,0 +1 @@
+I read it as "please find the nin.com mail from your spambox, wasn't that bad :)

diff --git a/blog/entry/spamvertunity.mdwn b/blog/entry/spamvertunity.mdwn
index 14aa79e..9f4b64d 100644
--- a/blog/entry/spamvertunity.mdwn
+++ b/blog/entry/spamvertunity.mdwn
@@ -3,7 +3,9 @@ to ensure the email does not get marked as spam, *please instruct your email
 client to accept mail from nin.com*."
 
 I wonder how many spambots are busy blasting off zillions of spams with headers
-forged to be from nin.com as we speak?
+forged to be from nin.com as we speak? Best of all, the spams can be
+customised, you know that many of the people getting them will enjoy this
+music.
 
 (Sometimes I wish I could take advantage of these money-making opportunities
 as they present themselves to me..)

diff --git a/blog/entry/spamvertunity.mdwn b/blog/entry/spamvertunity.mdwn
new file mode 100644
index 0000000..14aa79e
--- /dev/null
+++ b/blog/entry/spamvertunity.mdwn
@@ -0,0 +1,9 @@
+"your download link will arrive momentarily at the email address you submitted.
+to ensure the email does not get marked as spam, *please instruct your email
+client to accept mail from nin.com*."
+
+I wonder how many spambots are busy blasting off zillions of spams with headers
+forged to be from nin.com as we speak?
+
+(Sometimes I wish I could take advantage of these money-making opportunities
+as they present themselves to me..)

diff --git a/blog/entry/running_a_wiki_on_Amazon_S3.mdwn b/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
index 2282ff1..80b0807 100644
--- a/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
+++ b/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
@@ -16,7 +16,7 @@ modified files into S3 as necessary.
 Amazon EC2 would be the obvious choice for where to run the "real" web
 server, but probably not the easiest one to set up. In my experiments, I've
 been running the ikiwiki CGI on
-[nearlyfreespeech](http://nearlyfreespeesh.net), and serving the rest of
+[nearlyfreespeech](http://nearlyfreespeech.net), and serving the rest of
 the wiki out of S3. Since page edits are relatively rare, I estimate this
 approach will cost a dollar or so a year for the CGI hosting (most of it
 paying for disk storage). The Amazon S3 hosting of course depends on number

diff --git a/blog/entry/running_a_wiki_on_Amazon_S3.mdwn b/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
index 7f590e9..2282ff1 100644
--- a/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
+++ b/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
@@ -16,7 +16,7 @@ modified files into S3 as necessary.
 Amazon EC2 would be the obvious choice for where to run the "real" web
 server, but probably not the easiest one to set up. In my experiments, I've
 been running the ikiwiki CGI on
-[nearlyfreespeech](http://nearlyfreespeesh.net], and serving the rest of
+[nearlyfreespeech](http://nearlyfreespeesh.net), and serving the rest of
 the wiki out of S3. Since page edits are relatively rare, I estimate this
 approach will cost a dollar or so a year for the CGI hosting (most of it
 paying for disk storage). The Amazon S3 hosting of course depends on number

diff --git a/blog/entry/running_a_wiki_on_Amazon_S3.mdwn b/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
new file mode 100644
index 0000000..7f590e9
--- /dev/null
+++ b/blog/entry/running_a_wiki_on_Amazon_S3.mdwn
@@ -0,0 +1,31 @@
+Continuing on with my plans to make [[code/ikiwiki]] more appealing to
+users without a dedicated server, this evening I've written an
+[ikiwiki plugin](http://ikiwiki.info/plugins/amazon_s3/) that makes it
+use Amazon S3.
+
+So, it's possible to publish a blog or other static website, built using
+ikiwiki, without needing your own web server at all. Ikiwiki builds a
+website and uploads it to Amazon, which then handles the web serving for
+you.
+
+If you want a traditional wiki that people can edit online, you can still
+serve the pages out of S3, but you will need to find a "real" web server to
+host the ikiwiki CGI that handles the page editing. It'll then inject
+modified files into S3 as necessary.
+
+Amazon EC2 would be the obvious choice for where to run the "real" web
+server, but probably not the easiest one to set up. In my experiments, I've
+been running the ikiwiki CGI on
+[nearlyfreespeech](http://nearlyfreespeesh.net], and serving the rest of
+the wiki out of S3. Since page edits are relatively rare, I estimate this
+approach will cost a dollar or so a year for the CGI hosting (most of it
+paying for disk storage). The Amazon S3 hosting of course depends on number
+of hits and storage size. And presumably it will scale very well, and be
+very competatively priced, if you believe Amazon's marketing. :-)
+
+----
+
+I'm loving that the design decisions I made about ikiwiki at the very
+beginning -- that it would use static web pages, and would be backed by a
+real revision control system, is now letting it be deployed in these
+interesting ways that I did not begin to envision back then!

diff --git a/blog/entry/distributed_wikis.mdwn b/blog/entry/distributed_wikis.mdwn
index f555b3d..38e0e6b 100644
--- a/blog/entry/distributed_wikis.mdwn
+++ b/blog/entry/distributed_wikis.mdwn
@@ -1,4 +1,4 @@
-Done some interesting stuff in [[code/ikwiki]] this evening..
+Done some interesting stuff in [[code/ikiwiki]] this evening..
 
 Maybe you want to set up a mirror of a wiki. It's easy enough to do with an
 ikiwiki that's backed by git since you can just clone its repository and

diff --git a/blog/entry/distributed_wikis.mdwn b/blog/entry/distributed_wikis.mdwn
index f2a3034..f555b3d 100644
--- a/blog/entry/distributed_wikis.mdwn
+++ b/blog/entry/distributed_wikis.mdwn
@@ -1,4 +1,4 @@
-Done some interesting stuff in ikwiki this evening..
+Done some interesting stuff in [[code/ikwiki]] this evening..
 
 Maybe you want to set up a mirror of a wiki. It's easy enough to do with an
 ikiwiki that's backed by git since you can just clone its repository and

diff --git a/blog/entry/distributed_wikis.mdwn b/blog/entry/distributed_wikis.mdwn
new file mode 100644
index 0000000..f2a3034
--- /dev/null
+++ b/blog/entry/distributed_wikis.mdwn
@@ -0,0 +1,30 @@
+Done some interesting stuff in ikwiki this evening..
+
+Maybe you want to set up a mirror of a wiki. It's easy enough to do with an
+ikiwiki that's backed by git since you can just clone its repository and
+set up the mirror. But how to know when there's an update of the origin
+wiki, to update your mirror? I've added a plugin that allows you to edit a
+page on the origin wiki, and ask it to ping your wiki. And another plugin
+that your wiki can use to listen for pings and update itself, pulling down
+the changes from version control.
+
+Nice thing about this is that any ikiwiki wiki that publishes its revision
+control, and enables the `pinger` plugin, can then be mirrored by anyone,
+with no coordination needed with its admin. Even multilevel mirror networks
+are possible to set up. (The astute may notice that loops are also
+possible.. but they will will be broken after 1 cycle.)
+
+But this doesn't only allow mirroring. If you're using distributed version
+control, it also allows branching of a wiki. Just mirror as usual, but then
+make changes to the mirror, and don't send them back to the origin. Instant
+branch, that will be kept up-to-date with changes made to the origin.
+(Unless there's a conflict, that would need to be manually resolved,
+obviously.)
+
+Wouldn't it be nice if you could git clone git://wikipedia.org/ or
+git://wiki.debian.org/ and go off and make it into something you're really
+happy with? Only thing standing in the way is that neither site uses
+ikiwiki. For now, you'll have to settle with cloning and branching
+git://git.ikiwiki.info/ :-)
+
+Technical details [here](http://ikiwiki.info/tips/distributed_wikis/).

diff --git a/code/moreutils/discussion.mdwn b/code/moreutils/discussion.mdwn
index c2c259e..8e48320 100644
--- a/code/moreutils/discussion.mdwn
+++ b/code/moreutils/discussion.mdwn
@@ -63,6 +63,6 @@ Interface:
     $ tourl "/tmp/my dir/idx.html"
     file:///tmp/my%20dir/idx.html
     $ tolocal "file://localhost/home/ben/Documents/report%202008.pdf"
-    /home/ben/Documents/report.pdf
+    /home/ben/Documents/report 2008.pdf
 
-Just a suggestion, easily solved using most high-level desktop programming APIs. Is there already a shell tool? --ulrik
+Just a suggestion, easily solved using most high-level desktop APIs. Is there already a shell tool? --ulrik

diff --git a/code/moreutils/discussion.mdwn b/code/moreutils/discussion.mdwn
index afc3bb4..c2c259e 100644
--- a/code/moreutils/discussion.mdwn
+++ b/code/moreutils/discussion.mdwn
@@ -54,3 +54,15 @@ Look at this poor man's hex editor, made with moreutils (and xxd)
     xxd $file | vipe | xxd -r | sponge $file
 
 For me 'vipe' is the killer app in moreutils, I hardly use the other (but I think it just takes getting used to the new repertoire). --ulrik.
+
+## URI to local path converter
+This shell problem pops up in shell scripting for Nautilus and some other gnome applications. I'm proposing a tool to convert between file:/// URIs and local paths, with the proper encoding conversions in that of course.
+
+Interface:
+
+    $ tourl "/tmp/my dir/idx.html"
+    file:///tmp/my%20dir/idx.html
+    $ tolocal "file://localhost/home/ben/Documents/report%202008.pdf"
+    /home/ben/Documents/report.pdf
+
+Just a suggestion, easily solved using most high-level desktop programming APIs. Is there already a shell tool? --ulrik

diff --git a/blog/entry/perl_5.10/discussion.mdwn b/blog/entry/perl_5.10/discussion.mdwn
index 7aa5659..4e61297 100644
--- a/blog/entry/perl_5.10/discussion.mdwn
+++ b/blog/entry/perl_5.10/discussion.mdwn
@@ -1 +1,3 @@
 How did you install 5.10?  Is there a Debian package somewhere?
+
+> in unstable

diff --git a/blog/entry/the_internet_empowerment_spectrum.mdwn b/blog/entry/the_internet_empowerment_spectrum.mdwn
new file mode 100644
index 0000000..1dab722
--- /dev/null
+++ b/blog/entry/the_internet_empowerment_spectrum.mdwn
@@ -0,0 +1,67 @@
+When I look at how people are using the net, I see a spectrum...
+
+At the low end, there are users who browse, and maybe post stuff to sites
+like flickr or youtube or wikipedia. When I hang out with these people, I'm
+struck by them being often quite smart, savvy, capable (and young), and
+wasting a lot of their time and inginuity fitting what they want to do into
+these narrow and (mostly) corporate-controlled and censored channels. And
+being limited by it in ways that they're not fully aware of. If you're in
+this group, please, *please* consider finding a way up the spectrum.
+
+At the high end are tecchies like me, we have at least one and often
+multiple servers, sometimes even in different countries/continents. We can
+write and run our own software with full control. This [excellent advogato
+article](http://www.advogato.org/article/808.html) calls it the "sovereign"
+level. We're not exactly kings when you look at who controls things from
+DNS to the internet backbone, but we're as close as it's practical to be
+without running your own wires. And we're statistically vanishingly few
+these days.
+
+So the middle is more and more interesting. For one thing, being king is
+expensive. So some of us [[move_down_a_level|moving_kite]], to virtual
+servers with xen or the like. Maybe we can't build our own kernel on our
+server anymore, but we don't have to worry about maintaining spinning disks
+and fans. And some people move up to this level too. One path is learning
+about running linux on a personal machine and then using an easy and cheap
+provider like [slicehost](http://slicehost.com). But still, users at this
+level are rare.
+
+The other interesting level (and the one I've not explored much myself) is a
+step up from the low end, where you have some form of inexpensive
+shared hosting, but can at least run your own code. This level seems quite
+a mess, there is no standardisation, everything has to be set up by hand,
+unless you use prepackaged control panel type things that probably take
+away most of the empowerment available at this level. A lot of people reach
+this level, but it's still fractions of a percent.
+
+So there seems quite a hump up from the lowest end of the empowerment
+spectrum to using shared hosting. How to encourage people over that hump is
+an interesting problem.
+
+----
+
+I've been playing with using some power tools from the top, sovereign level
+down in these murky shared hosting depths. Decided to see what kind of
+stuff I could accomplish for $5. Although it ended up costing only 2 cents
+for hosting so far.
+
+Amazon and google's hosting servives look interesting, but need things to
+be designed explcitly for them. And those companies are too big already.
+[NearlyFreeSpeech.net](http://NearlyFreeSpeech.net) is more flexible,
+funky, and has a cheap pay-as-you-go pricing that's ideal for little things
+that will only use a few dollars of bandwidth.
+
+So, I [got ikiwiki working there (and documented how)](http://ikiwiki.info/tips/nearlyfreespeech/),
+along with a git backend, so my wiki's sources can be cloned to elsewhere for
+backups and development.
+
+Some things I hope to do later include:
+
+* Allowing ikiwiki aggregation to be kicked off via the web. There's no cron
+  jobs on these systems so you have to use something like webcron. (Which I
+  dreamed up last night, but am happy to see someone else already
+  implemented.)
+* Implementing Madduck's idea to trigger ikiwiki mirrors via the web.
+  So you can set up a cluster of mirrored wikis on disparate shared
+  hosting.
+* Using Amazon s3 to store wiki pages and handle file serving.

diff --git a/blog/entry/perl_5.10/discussion.mdwn b/blog/entry/perl_5.10/discussion.mdwn
new file mode 100644
index 0000000..7aa5659
--- /dev/null
+++ b/blog/entry/perl_5.10/discussion.mdwn
@@ -0,0 +1 @@
+How did you install 5.10?  Is there a Debian package somewhere?

diff --git a/blog/entry/debconf8__63__/discussion.mdwn b/blog/entry/debconf8__63__/discussion.mdwn
new file mode 100644
index 0000000..cc77752
--- /dev/null
+++ b/blog/entry/debconf8__63__/discussion.mdwn
@@ -0,0 +1,6 @@
+You seem to really have missed it, here are the links into the lists archive:
+[DebConf8: registration and call for papers](http://lists.debian.org/debian-devel-announce/2008/02/msg00001.html),
+[DebConf8 Registration closes soon](http://lists.debian.org/debian-devel-announce/2008/03/msg00013.html)
+
+So long,
+Rhonda

diff --git a/blog/entry/perl_5.10.mdwn b/blog/entry/perl_5.10.mdwn
new file mode 100644
index 0000000..2895347
--- /dev/null
+++ b/blog/entry/perl_5.10.mdwn
@@ -0,0 +1,4 @@
+Yay, perl 5.10 at last. I've been working on fixing various breakage
+related to it all day. But to make up for that, I benchmarked ikiwiki.
+Thanks mostly to the trie optimisation of string alternations, ikiwiki is
+nearly twice as fast with perl 5.10 as it was with 5.8.

diff --git a/code/debhelper/news/version_7.0.3.mdwn b/code/debhelper/news/version_7.0.3.mdwn
deleted file mode 100644
index 20bdb1a..0000000
--- a/code/debhelper/news/version_7.0.3.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-debhelper 7.0.3 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh: Fix man page typos. Closes: #[477933](http://bugs.debian.org/477933)
-   * Add missing $! to error message when the log can't be opened.
-   * One problem with the log files is that if dh\_clean is not the last command
-     run, they will be left behind. This is a particular problem on build
-     daemons that use real root. Especially if cdbs is used, since it runs
-     dh\_listpackages after clean, thereby leaving behind log files that
-     only root can touch. Avoid this particular special case by inhibiting
-     logging by dh\_listpackages."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.8.mdwn b/code/debhelper/news/version_7.0.8.mdwn
new file mode 100644
index 0000000..ec3a643
--- /dev/null
+++ b/code/debhelper/news/version_7.0.8.mdwn
@@ -0,0 +1,11 @@
+debhelper 7.0.8 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * dh: Add an interface that third-party packages providing debhelper commands
+     can use to insert them into a command sequence.
+     (See dh(1), "SEQUENCE ADDONS".)
+   * dh: --with=foo can be used to include such third-party commands.
+     So, for example, --with=cli could add the dh\_cli* commands from
+     cli-common.
+   * Moved python-support special case out of dh and into a python-support
+     sequence addon. --with=python-support is enabled by default to avoid
+     breaking backwards compatability."""]]
\ No newline at end of file

diff --git a/code/debhelper/news/version_7.0.2.mdwn b/code/debhelper/news/version_7.0.2.mdwn
deleted file mode 100644
index 10b7442..0000000
--- a/code/debhelper/news/version_7.0.2.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-debhelper 7.0.2 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * dh: Optimise the case where the binary-arch or binary-indep sequence is
-     run and there are no packages of that type.
-   * dh\_auto\_configure: Set PERL\_MM\_USE\_DEFAULT when configuring MakeMaker
-     packages to avoid interactive prompts.
-   * dh\_auto\_*: Also support packages using Module::Build.
-   * dh\_auto\_*: Fix some calls to setup.py. Now tested and working with
-     python packages.
-   * dh\_install: Find all possible cases of "changelog" and "changes", rather
-     than just looking for some predefined common cases."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.7.mdwn b/code/debhelper/news/version_7.0.7.mdwn
new file mode 100644
index 0000000..ef7386e
--- /dev/null
+++ b/code/debhelper/news/version_7.0.7.mdwn
@@ -0,0 +1,4 @@
+debhelper 7.0.7 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * dh\_installxfonts: Fix precidence problem that exposes a new warning
+     message in perl 5.10."""]]
\ No newline at end of file

diff --git a/blog/entry/wortroot_meeting_08.mdwn b/blog/entry/wortroot_meeting_08.mdwn
new file mode 100644
index 0000000..fddb868
--- /dev/null
+++ b/blog/entry/wortroot_meeting_08.mdwn
@@ -0,0 +1,13 @@
+Out hiking and wading yesterday, and again today. Then the board meeting,
+amending documents older than I am, then another walk to recuperate from
+that (though it really went quite well). The trilliums are mostly down to
+pink, still some white ones by the spring, quite gorgeous.
+
+Unlike at Anna's, the overriding impression is lush and green and blooming.
+Maybe that valley is just a very special place. Still, this spring feels
+fragile, as if rain is much more important than it should be.
+
+Oh, and nettle soup is yummy. I take back all my unkind thoughts about
+stinging nettles over the years.
+
+[[tag lay]]

diff --git a/code/etckeeper/news/version_0.12.mdwn b/code/etckeeper/news/version_0.12.mdwn
deleted file mode 100644
index b7c3214..0000000
--- a/code/etckeeper/news/version_0.12.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-etckeeper 0.12 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Use git ls-files instead of git status. Depend on new enough git for this.
-   * Add support for bzr, thanks to Mark A. Hershberger. Closes: #[470515](http://bugs.debian.org/470515)
-     (Note that bzr does not support etckeeper's pre-commit hook.)"""]]
\ No newline at end of file
diff --git a/code/etckeeper/news/version_0.15.mdwn b/code/etckeeper/news/version_0.15.mdwn
new file mode 100644
index 0000000..77a44b4
--- /dev/null
+++ b/code/etckeeper/news/version_0.15.mdwn
@@ -0,0 +1,14 @@
+etckeeper 0.15 released with [[toggle text="these changes"]]
+\[[toggleable text="""
+ * [ Daniel Hahler ]
+   * bzr: Set nickname for tree in init.d/40vcs-init.
+   * Add script to add new files during "commit" for bzr (commit.d/30bzr-add).
+     Closes: #[477321](http://bugs.debian.org/477321)
+   * Fix handling of files with spaces, by setting IFS to "newline" in
+     commit.d/40git-rm.
+ * [ Jelmer Vernooij ]
+   * Support for the new bzr pre-commit hook. This requires bzr version 1.4.
+     Closes: #[473069](http://bugs.debian.org/473069)
+   * Remove pointless commit.d/40bzr-rm script.
+ * [ Joey Hess ]
+   * debhelper v7; rules file minimisation"""]]
\ No newline at end of file

diff --git a/blog/entry/debconf8__63__.mdwn b/blog/entry/debconf8__63__.mdwn
new file mode 100644
index 0000000..d3b3511
--- /dev/null
+++ b/blog/entry/debconf8__63__.mdwn
@@ -0,0 +1,12 @@
+[[img pics/going_debconf8_unknown.png]]
+
+I wonder if I've missed the deadline to apply for travel funding for
+DebConf8. I didn't see a mail about a deadline; perhaps I missed one
+but I also don't see one in the list archives or on the website.
+
+OTOH, I do see talk in the list archives in the end of April about an
+upcoming meeting to allocate funding.
+
+So, confused, but as usual also ambivilant about expecting to be funded for
+transcontinental travel, especially as I'm too lazy lately to legitimise it
+by presenting at the conference.
diff --git a/blog/pics/going_debconf8_unknown.png b/blog/pics/going_debconf8_unknown.png
new file mode 100644
index 0000000..675b490
Binary files /dev/null and b/blog/pics/going_debconf8_unknown.png differ

diff --git a/code/debhelper/news/version_7.0.1.mdwn b/code/debhelper/news/version_7.0.1.mdwn
deleted file mode 100644
index 419b537..0000000
--- a/code/debhelper/news/version_7.0.1.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-debhelper 7.0.1 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * I lied, one more v7 change slipped in..
-   * dh\_installchangelogs: In v7 mode, if no upstream changelog is specified,
-     and the package is not native, guess at a few common changelog filenames."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.6.mdwn b/code/debhelper/news/version_7.0.6.mdwn
new file mode 100644
index 0000000..7ed05a6
--- /dev/null
+++ b/code/debhelper/news/version_7.0.6.mdwn
@@ -0,0 +1,3 @@
+debhelper 7.0.6 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * dh\_auto\_test: Correct Module::Build tests."""]]
\ No newline at end of file

diff --git a/ikiwiki/subpage/linkingrules.mdwn b/ikiwiki/subpage/linkingrules.mdwn
deleted file mode 100644
index 257cc56..0000000
--- a/ikiwiki/subpage/linkingrules.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-foo

diff --git a/ikiwiki/subpage/linkingrules.mdwn b/ikiwiki/subpage/linkingrules.mdwn
new file mode 100644
index 0000000..257cc56
--- /dev/null
+++ b/ikiwiki/subpage/linkingrules.mdwn
@@ -0,0 +1 @@
+foo

diff --git a/code/moreutils/discussion.mdwn b/code/moreutils/discussion.mdwn
index 41a6748..afc3bb4 100644
--- a/code/moreutils/discussion.mdwn
+++ b/code/moreutils/discussion.mdwn
@@ -46,3 +46,11 @@ works like "ls -l | pager" but
 works correctly and writes the output of "ls -l" in "myfilelist". This command would be useful for aliases, so you could add git's autopaging to other commands like this:
 
     alias ls="autopage ls"
+
+## moreutils tricks
+
+Look at this poor man's hex editor, made with moreutils (and xxd)
+
+    xxd $file | vipe | xxd -r | sponge $file
+
+For me 'vipe' is the killer app in moreutils, I hardly use the other (but I think it just takes getting used to the new repertoire). --ulrik.

diff --git a/code/debhelper/news/version_7.0.0.mdwn b/code/debhelper/news/version_7.0.0.mdwn
deleted file mode 100644
index 9c2a24c..0000000
--- a/code/debhelper/news/version_7.0.0.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-debhelper 7.0.0 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh: New program that runs a series of debhelper commands in a sequence.
-     This can be used to construct very short rules files (as short as 3
-     lines), while still exposing the full power of debhelper when it's
-     needed.
-   * dh\_auto\_configure: New program, automates running ./configure,
-     Makefile.PL, and python distutils. Calls them with exactly the same
-     options as cdbs does by default, and allows adding/overriding options.
-   * dh\_auto\_build: New program, automates building the package by either
-     running make or using setup.py. (Support for cmake and other build systems
-     planned but not yet implemented.)
-   * dh\_auto\_test: New program, automates running make test or make check
-     if the Makefile has such a target.
-   * dh\_auto\_clean: New program, automates running make clean (or distclean,
-     or realclean), or using setup.py to clean up.
-   * dh\_auto\_install: New program, automates running make install, or using
-     setup.py to install. Supports the PREFIX=/usr special case needed by
-     MakeMaker Makefiles. (Support for cmake and other build systems planned
-     but not yet implemented.)
-   * New v7 mode, which only has three changes from v6, and is the new
-     recommended default, especially when using dh.
-   * dh\_install: In v7 mode, if --sourcedir is not specified, first look for
-     files in debian/tmp, and then will look in the current directory. This
-     allows dh\_install to interoperate with dh\_auto\_install without needing any
-     special parameters.
-   * dh\_clean: In v7 mode, read debian/clean and delete all files listed
-     therein.
-   * dh\_clean: In v7 mode, automatically delete *-stamp files.
-   * Add a Makefile and simplify this package's own rules file using
-     all the new toys.
-   * dh\_clean: Don't delete core dumps. (Too DWIM, and "core" is not
-     necessarily a core dump.) Closes: #[477391](http://bugs.debian.org/477391)
-   * dh\_prep: New program, does the same as dh\_clean -k (which will be
-     deprecated later)."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.5.mdwn b/code/debhelper/news/version_7.0.5.mdwn
new file mode 100644
index 0000000..211518c
--- /dev/null
+++ b/code/debhelper/news/version_7.0.5.mdwn
@@ -0,0 +1,4 @@
+debhelper 7.0.5 released with [[toggle text="these changes"]]
+\[[toggleable text="""
+   * Convert copyright file to new format.
+   * dh\_test*: inhibit logging. Closes: #[478958](http://bugs.debian.org/478958)"""]]
\ No newline at end of file

diff --git a/code/alien/news/version_8.67.mdwn b/code/alien/news/version_8.67.mdwn
deleted file mode 100644
index 51b1484..0000000
--- a/code/alien/news/version_8.67.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-alien 8.67 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Update the url to the web page, and remove several other broken urls from
-     the README.
-   * Correct a bug that caused alien to ignore failing commands. Closes: #[424858](http://bugs.debian.org/424858)"""]]
\ No newline at end of file
diff --git a/code/alien/news/version_8.72.mdwn b/code/alien/news/version_8.72.mdwn
new file mode 100644
index 0000000..df60eef
--- /dev/null
+++ b/code/alien/news/version_8.72.mdwn
@@ -0,0 +1,7 @@
+alien 8.72 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * Use debhelper 7, rules file minimisation.
+   * Improve parsing of tgz filenames, to avoid confusion when the filename
+     includes the package type (ie, "noarch"). Patch from Andrej Ricnik-Bay.
+   * When generating a debian changelog file, work around bug #478925 by
+     including the alien changelog text inside the debian changelog entry."""]]
\ No newline at end of file

diff --git a/code/moreutils/discussion.mdwn b/code/moreutils/discussion.mdwn
index ebfbda0..41a6748 100644
--- a/code/moreutils/discussion.mdwn
+++ b/code/moreutils/discussion.mdwn
@@ -5,11 +5,14 @@ comments --[[Joey]]
 
 A suggestion regarding vidir:
 I would find it quite useful if vidir could work with version control system commands like:
-  svn mv
-  svn rm
+
+    svn mv
+    svn rm
+
 or
-  git mv
-  git rm
+
+    git mv
+    git rm
 
 Another improvement would be the addition would be to add checkboxes to control which files should be controlled by the vcs and which shouldn't.
 
@@ -29,3 +32,17 @@ I often want this in crontabs, as in:
   find . -name core | ifne mail -s "Core files found" root
 
 > This is a good idea, and included now.
+
+## autopage
+
+A command that pages the stdout of a subcommand only if stdout is a tty, similar to the way git treats its stdout. For example:
+
+    autopage ls -l
+
+works like "ls -l | pager" but
+
+    autopage ls -l >mifilelist
+
+works correctly and writes the output of "ls -l" in "myfilelist". This command would be useful for aliases, so you could add git's autopaging to other commands like this:
+
+    alias ls="autopage ls"

diff --git a/code/debhelper/news/version_7.0.4.mdwn b/code/debhelper/news/version_7.0.4.mdwn
new file mode 100644
index 0000000..600b751
--- /dev/null
+++ b/code/debhelper/news/version_7.0.4.mdwn
@@ -0,0 +1,4 @@
+debhelper 7.0.4 released with [[toggle text="these changes"]]
+\[[toggleable text="""
+   * Fix underescaped $ in Makefile. Closes: #[478475](http://bugs.debian.org/478475)
+   * dh\_auto\_test: Run tests for Module::Build packages. (Florian Ragwitz)"""]]
\ No newline at end of file

diff --git a/blog/entry/vipl.mdwn b/blog/entry/vipl.mdwn
new file mode 100644
index 0000000..9c2fa6e
--- /dev/null
+++ b/blog/entry/vipl.mdwn
@@ -0,0 +1,6 @@
+Here's a nice toy I added to [[code/mpdtoys]] this evening. `vipl` allows
+editing mpd's playlist in a standard text editor. Reorder or
+delete songs, etc. Enter ">" in front of the song you want to play. Type in
+partial song, album, or artist names and it will expand them to any matches.
+
+`:wq` to start the music playing.

diff --git a/code/mpdtoys.mdwn b/code/mpdtoys.mdwn
index b7778f0..abb0916 100644
--- a/code/mpdtoys.mdwn
+++ b/code/mpdtoys.mdwn
@@ -6,7 +6,8 @@ Some examples of things the mpdtoys can do include moving the playing
 song between different mpd daemons on different machines, storing
 the state of a mpd daemon and loading it back later, reversing the
 playlist, slowly fading volume up or down, stopping playback after the
-current song finishes, and emulating a skipping record.
+current song finishes, emulating a skipping record, and editing the
+playlist in a text editor.
 
 The mpdtoys are available in git at `git://git.kitenet.net/mpdtoys`, or
 [in gitweb](http://git.kitenet.net/?p=mpdtoys).
diff --git a/code/mpdtoys/news/version_0.8.mdwn b/code/mpdtoys/news/version_0.8.mdwn
new file mode 100644
index 0000000..a9593c6
--- /dev/null
+++ b/code/mpdtoys/news/version_0.8.mdwn
@@ -0,0 +1,5 @@
+mpdtoys 0.8 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * vipl: New program, allows editing the mpd playlist in your text editor.
+   * Use debhelper v7; rules file minimisation.
+   * Use DESTDIR rather than DEST."""]]
\ No newline at end of file

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
index 5288a6c..c2e4a34 100644
--- a/blog/entry/quotes_and_reflections.mdwn
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -18,7 +18,7 @@ who have no desire to let you inside their head.
 
 ### Steve Yegge
 
-Steve is very quotable. From [Xemacs is dead, Long live Xemacs](http://steve-yegge.blogspot.com/2008/04/xemacs-is-dead-long-live-xemacs.htm):
+Steve is very quotable. From [Xemacs is dead, Long live Xemacs](http://steve-yegge.blogspot.com/2008/04/xemacs-is-dead-long-live-xemacs.html):
 
 > XEmacs should drop out of the race
 > 

diff --git a/blog/entry/quotes_and_reflections/discussion.mdwn b/blog/entry/quotes_and_reflections/discussion.mdwn
new file mode 100644
index 0000000..9b499f9
--- /dev/null
+++ b/blog/entry/quotes_and_reflections/discussion.mdwn
@@ -0,0 +1 @@
+Re: the Hans stuff: sad news. I haven't followed any of the trial developments recently, so maybe things have changed since I last did -- but it strikes me as very odd a man can be found guilty of murder with no body found, no murder weapon or method known, etc. -- [[JonDowland]]

diff --git a/code/debhelper/news/version_7.0.3.mdwn b/code/debhelper/news/version_7.0.3.mdwn
new file mode 100644
index 0000000..20bdb1a
--- /dev/null
+++ b/code/debhelper/news/version_7.0.3.mdwn
@@ -0,0 +1,10 @@
+debhelper 7.0.3 released with [[toggle text="these changes"]]
+\[[toggleable text="""
+   * dh: Fix man page typos. Closes: #[477933](http://bugs.debian.org/477933)
+   * Add missing $! to error message when the log can't be opened.
+   * One problem with the log files is that if dh\_clean is not the last command
+     run, they will be left behind. This is a particular problem on build
+     daemons that use real root. Especially if cdbs is used, since it runs
+     dh\_listpackages after clean, thereby leaving behind log files that
+     only root can touch. Avoid this particular special case by inhibiting
+     logging by dh\_listpackages."""]]
\ No newline at end of file

diff --git a/untext.mdwn b/untext.mdwn
index 832601a..bfc755b 100644
--- a/untext.mdwn
+++ b/untext.mdwn
@@ -22,4 +22,4 @@ List of feeds:
 * [[aggregate expireage=7 name="appalachian treks" feedurl="http://feeds.feedburner.com/AppalachianTreks" url="http://appalachiantreks.blogspot.com/"]]
 * [[aggregate expireage=7 name="boy on a stick and slither" feedurl="http://www.boasas.com/boasas_rss.xml" url="http://boasas.com/"]]
 * [[aggregate expireage=7 name="a softer world" feedurl="http://rsspect.com/rss/asw.xml" url="http://www.asofterworld.com/"]]
-* [[aggregate expireage=7 name="said the gramophone" feedurl="http://p-stat.livejournal.com/img/xml.gif" url="http://www.saidthegramophone.com/"]]
+* [[aggregate expireage=7 name="said the gramophone" feedurl="http://feeds.feedburner.com/saidthegramophone/stg" url="http://www.saidthegramophone.com/"]]

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
index 6e0bca9..5288a6c 100644
--- a/blog/entry/quotes_and_reflections.mdwn
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -61,4 +61,4 @@ struck me as shady and disenfranchising.
 
 But, after reading Rick's excellent summaries of every day of the trial, I
 still have no idea if Reiser killed his wife, and indeed no clue if she's
- dead at all, or instead back in Russia with the children.
+dead at all, or instead back in Russia with the children.

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
index 63f8f54..6e0bca9 100644
--- a/blog/entry/quotes_and_reflections.mdwn
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -1,6 +1,4 @@
-### coding is loss
-
-[The Bandwidth of Code](http://blogs.concedere.net:8080/blog/discipline/software+engineering/?permalink=The-Bandwidth-of-Code.html):
+### [The Bandwidth of Code](http://blogs.concedere.net:8080/blog/discipline/software+engineering/?permalink=The-Bandwidth-of-Code.html):
 
 > Hell is Other People's Code is, perhaps, another way of saying that code is a
 > terrible way to communicate with other human beings. Foreign code inspires a

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
index 1910ee6..63f8f54 100644
--- a/blog/entry/quotes_and_reflections.mdwn
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -1,4 +1,4 @@
-## coding is loss
+### coding is loss
 
 [The Bandwidth of Code](http://blogs.concedere.net:8080/blog/discipline/software+engineering/?permalink=The-Bandwidth-of-Code.html):
 
@@ -18,7 +18,7 @@ their mistakes and false tries in their version control history.
 This is why rebasing is bad. But also why it appeals to so many developers,
 who have no desire to let you inside their head.
 
-## Steve Yegge
+### Steve Yegge
 
 Steve is very quotable. From [Xemacs is dead, Long live Xemacs](http://steve-yegge.blogspot.com/2008/04/xemacs-is-dead-long-live-xemacs.htm):
 
@@ -44,7 +44,7 @@ Best of all they're in these enormous
 blog-rants of chapter length that discuss a topic in depth, then go out the
 other side. Great fun, even if you disagree with him.
 
-## sad end
+### sad end
 
 [SFGate reports](http://www.sfgate.com/cgi-bin/blogs/sfgate/detail?blogid=37&entry_id=26050):
 

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
index 1883774..1910ee6 100644
--- a/blog/entry/quotes_and_reflections.mdwn
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -1,4 +1,6 @@
-## the bandwidth of code
+## coding is loss
+
+[The Bandwidth of Code](http://blogs.concedere.net:8080/blog/discipline/software+engineering/?permalink=The-Bandwidth-of-Code.html):
 
 > Hell is Other People's Code is, perhaps, another way of saying that code is a
 > terrible way to communicate with other human beings. Foreign code inspires a
@@ -8,8 +10,6 @@
 > we try to translate our ideas and desires into program code. And this
 > tremendous loss of knowledge looks to be unavoidable.
 
--- <http://blogs.concedere.net:8080/blog/discipline/software+engineering/?permalink=The-Bandwidth-of-Code.html>
-
 Since even Knuth has given up on literate programming as a general solution
 to this kind of problem, let me throw another possibility out there: Version
 control. It's not perfect, but you _can_ get into someone's head by reading
@@ -20,7 +20,7 @@ who have no desire to let you inside their head.
 
 ## Steve Yegge
 
-Steve is very quotable:
+Steve is very quotable. From [Xemacs is dead, Long live Xemacs](http://steve-yegge.blogspot.com/2008/04/xemacs-is-dead-long-live-xemacs.htm):
 
 > XEmacs should drop out of the race
 > 
@@ -28,23 +28,17 @@ Steve is very quotable:
 > superdelegates. That warmonger VIM is sitting back and laughing at us. But
 > XEmacs just won't quit!
 
--- <http://steve-yegge.blogspot.com/2008/04/xemacs-is-dead-long-live-xemacs.html>
-
-And some deep insights into the mind of an emacs user:
+And has some deep insights into the mind of an emacs user. From [the Pinocchio Problem](http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html):
 
 > Viewed from a radical, yet possibly defensible perspective, a reboot is a
 > murder.
 
--- <http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html>
-
 And some things that ring true (or at least provide another excuse for not
-learning haskell properly):
+learning haskell properly). Also from [the Pinocchio Problem](http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html):
 
 > There's nothing wrong with static type systems. You just have to realize
 > that when you use them, you're building hardware, not software.
 
--- <http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html>
-
 Best of all they're in these enormous
 [long](http://steve-yegge.blogspot.com/2008/01/blogging-theory-201-size-does-matter.html)
 blog-rants of chapter length that discuss a topic in depth, then go out the
@@ -52,6 +46,8 @@ other side. Great fun, even if you disagree with him.
 
 ## sad end
 
+[SFGate reports](http://www.sfgate.com/cgi-bin/blogs/sfgate/detail?blogid=37&entry_id=26050):
+
 > Reiser is guilty of first-degree murder, the jury has found.
 > 
 > He killed Nina with premeditation and deliberation and now faces 25 years
@@ -60,8 +56,6 @@ other side. Great fun, even if you disagree with him.
 > Pressed to elaborate, Du Bois said, "I'm sure he negatively impressed the
 > jurors."
 
--- <http://www.sfgate.com/cgi-bin/blogs/sfgate/detail?blogid=37&entry_id=26050>
-
 Hans also mostly negatively impressed me the one time I met him (and the
 one time I emailed him). And the whole business of hiring Russian
 programmers to slave away at a filesystem with your name on it has always
@@ -69,4 +63,4 @@ struck me as shady and disenfranchising.
 
 But, after reading Rick's excellent summaries of every day of the trial, I
 still have no idea if Reiser killed his wife, and indeed no clue if she's
-dead at all, or instead back in Russia with the children.
+ dead at all, or instead back in Russia with the children.

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
index e61111c..1883774 100644
--- a/blog/entry/quotes_and_reflections.mdwn
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -60,6 +60,8 @@ other side. Great fun, even if you disagree with him.
 > Pressed to elaborate, Du Bois said, "I'm sure he negatively impressed the
 > jurors."
 
+-- <http://www.sfgate.com/cgi-bin/blogs/sfgate/detail?blogid=37&entry_id=26050>
+
 Hans also mostly negatively impressed me the one time I met him (and the
 one time I emailed him). And the whole business of hiring Russian
 programmers to slave away at a filesystem with your name on it has always

diff --git a/blog/entry/quotes_and_reflections.mdwn b/blog/entry/quotes_and_reflections.mdwn
new file mode 100644
index 0000000..e61111c
--- /dev/null
+++ b/blog/entry/quotes_and_reflections.mdwn
@@ -0,0 +1,70 @@
+## the bandwidth of code
+
+> Hell is Other People's Code is, perhaps, another way of saying that code is a
+> terrible way to communicate with other human beings. Foreign code inspires a
+> mixture of apprehension, anger and anxiety precisely because the bandwidth
+> capacity of written code is so horrifying small. Enormous amounts of context,
+> nuance, philosophy, history -- in short, knowledge -- is lost forever each time
+> we try to translate our ideas and desires into program code. And this
+> tremendous loss of knowledge looks to be unavoidable.
+
+-- <http://blogs.concedere.net:8080/blog/discipline/software+engineering/?permalink=The-Bandwidth-of-Code.html>
+
+Since even Knuth has given up on literate programming as a general solution
+to this kind of problem, let me throw another possibility out there: Version
+control. It's not perfect, but you _can_ get into someone's head by reading
+their mistakes and false tries in their version control history.
+
+This is why rebasing is bad. But also why it appeals to so many developers,
+who have no desire to let you inside their head.
+
+## Steve Yegge
+
+Steve is very quotable:
+
+> XEmacs should drop out of the race
+> 
+> At this point it's becoming painful to watch. GNU Emacs is getting all the
+> superdelegates. That warmonger VIM is sitting back and laughing at us. But
+> XEmacs just won't quit!
+
+-- <http://steve-yegge.blogspot.com/2008/04/xemacs-is-dead-long-live-xemacs.html>
+
+And some deep insights into the mind of an emacs user:
+
+> Viewed from a radical, yet possibly defensible perspective, a reboot is a
+> murder.
+
+-- <http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html>
+
+And some things that ring true (or at least provide another excuse for not
+learning haskell properly):
+
+> There's nothing wrong with static type systems. You just have to realize
+> that when you use them, you're building hardware, not software.
+
+-- <http://steve-yegge.blogspot.com/2007/01/pinocchio-problem.html>
+
+Best of all they're in these enormous
+[long](http://steve-yegge.blogspot.com/2008/01/blogging-theory-201-size-does-matter.html)
+blog-rants of chapter length that discuss a topic in depth, then go out the
+other side. Great fun, even if you disagree with him.
+
+## sad end
+
+> Reiser is guilty of first-degree murder, the jury has found.
+> 
+> He killed Nina with premeditation and deliberation and now faces 25 years
+> to life in prison.
+
+> Pressed to elaborate, Du Bois said, "I'm sure he negatively impressed the
+> jurors."
+
+Hans also mostly negatively impressed me the one time I met him (and the
+one time I emailed him). And the whole business of hiring Russian
+programmers to slave away at a filesystem with your name on it has always
+struck me as shady and disenfranchising.
+
+But, after reading Rick's excellent summaries of every day of the trial, I
+still have no idea if Reiser killed his wife, and indeed no clue if she's
+dead at all, or instead back in Russia with the children.

diff --git a/untext.mdwn b/untext.mdwn
index dc6506a..832601a 100644
--- a/untext.mdwn
+++ b/untext.mdwn
@@ -22,3 +22,4 @@ List of feeds:
 * [[aggregate expireage=7 name="appalachian treks" feedurl="http://feeds.feedburner.com/AppalachianTreks" url="http://appalachiantreks.blogspot.com/"]]
 * [[aggregate expireage=7 name="boy on a stick and slither" feedurl="http://www.boasas.com/boasas_rss.xml" url="http://boasas.com/"]]
 * [[aggregate expireage=7 name="a softer world" feedurl="http://rsspect.com/rss/asw.xml" url="http://www.asofterworld.com/"]]
+* [[aggregate expireage=7 name="said the gramophone" feedurl="http://p-stat.livejournal.com/img/xml.gif" url="http://www.saidthegramophone.com/"]]

diff --git a/untext.mdwn b/untext.mdwn
index 92cd4ec..dc6506a 100644
--- a/untext.mdwn
+++ b/untext.mdwn
@@ -20,5 +20,5 @@ List of feeds:
 * [[aggregate expireage=7 name="eler" feedurl="http://geekz.co.uk/lovesraymond/feed/" url="http://geekz.co.uk/lovesraymond/"]]
 * [[aggregate expireage=7 name="nobody scores" feedurl="http://nobodyscores.loosenutstudio.com/index.php?category=comics&section=comics&rss=1" url="http://nobodyscores.loosenutstudio.com/"]]
 * [[aggregate expireage=7 name="appalachian treks" feedurl="http://feeds.feedburner.com/AppalachianTreks" url="http://appalachiantreks.blogspot.com/"]]
-* [[aggregate expireage=7 name="boy on a stick and slither" feedurl="http://interglacial.com/rss/boy_on_a_stick_and_slither.rss" url="http://boasas.com/"]]
+* [[aggregate expireage=7 name="boy on a stick and slither" feedurl="http://www.boasas.com/boasas_rss.xml" url="http://boasas.com/"]]
 * [[aggregate expireage=7 name="a softer world" feedurl="http://rsspect.com/rss/asw.xml" url="http://www.asofterworld.com/"]]

diff --git a/pkg-comp/pkg-comp.xml b/pkg-comp/pkg-comp.xml
index 99e685d..bc6a689 100644
--- a/pkg-comp/pkg-comp.xml
+++ b/pkg-comp/pkg-comp.xml
@@ -204,7 +204,7 @@ Is there a place in the metadata for a description of the package?
 <tgz>yes
 <footnote>
 There's an install/description file for this information in at
-least some Slashware tgz files.		
+least some Slackware tgz files.		
 </footnote>	
 </tgz>
 <pkg>yes</pkg>

diff --git a/code/debhelper/news/version_7.0.2.mdwn b/code/debhelper/news/version_7.0.2.mdwn
new file mode 100644
index 0000000..10b7442
--- /dev/null
+++ b/code/debhelper/news/version_7.0.2.mdwn
@@ -0,0 +1,11 @@
+debhelper 7.0.2 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * dh: Optimise the case where the binary-arch or binary-indep sequence is
+     run and there are no packages of that type.
+   * dh\_auto\_configure: Set PERL\_MM\_USE\_DEFAULT when configuring MakeMaker
+     packages to avoid interactive prompts.
+   * dh\_auto\_*: Also support packages using Module::Build.
+   * dh\_auto\_*: Fix some calls to setup.py. Now tested and working with
+     python packages.
+   * dh\_install: Find all possible cases of "changelog" and "changes", rather
+     than just looking for some predefined common cases."""]]
\ No newline at end of file

diff --git a/code/debhelper/news/version_7.0.1.mdwn b/code/debhelper/news/version_7.0.1.mdwn
new file mode 100644
index 0000000..419b537
--- /dev/null
+++ b/code/debhelper/news/version_7.0.1.mdwn
@@ -0,0 +1,5 @@
+debhelper 7.0.1 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * I lied, one more v7 change slipped in..
+   * dh\_installchangelogs: In v7 mode, if no upstream changelog is specified,
+     and the package is not native, guess at a few common changelog filenames."""]]
\ No newline at end of file

diff --git a/code/debhelper/news/version_7.0.1.mdwn b/code/debhelper/news/version_7.0.1.mdwn
deleted file mode 100644
index 419b537..0000000
--- a/code/debhelper/news/version_7.0.1.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-debhelper 7.0.1 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * I lied, one more v7 change slipped in..
-   * dh\_installchangelogs: In v7 mode, if no upstream changelog is specified,
-     and the package is not native, guess at a few common changelog filenames."""]]
\ No newline at end of file

diff --git a/code/debhelper/news/version_7.0.1.mdwn b/code/debhelper/news/version_7.0.1.mdwn
new file mode 100644
index 0000000..419b537
--- /dev/null
+++ b/code/debhelper/news/version_7.0.1.mdwn
@@ -0,0 +1,5 @@
+debhelper 7.0.1 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * I lied, one more v7 change slipped in..
+   * dh\_installchangelogs: In v7 mode, if no upstream changelog is specified,
+     and the package is not native, guess at a few common changelog filenames."""]]
\ No newline at end of file

diff --git a/code/debhelper/news/version_7.0.0.mdwn b/code/debhelper/news/version_7.0.0.mdwn
new file mode 100644
index 0000000..9c2a24c
--- /dev/null
+++ b/code/debhelper/news/version_7.0.0.mdwn
@@ -0,0 +1,35 @@
+debhelper 7.0.0 released with [[toggle text="these changes"]]
+\[[toggleable text="""
+   * dh: New program that runs a series of debhelper commands in a sequence.
+     This can be used to construct very short rules files (as short as 3
+     lines), while still exposing the full power of debhelper when it's
+     needed.
+   * dh\_auto\_configure: New program, automates running ./configure,
+     Makefile.PL, and python distutils. Calls them with exactly the same
+     options as cdbs does by default, and allows adding/overriding options.
+   * dh\_auto\_build: New program, automates building the package by either
+     running make or using setup.py. (Support for cmake and other build systems
+     planned but not yet implemented.)
+   * dh\_auto\_test: New program, automates running make test or make check
+     if the Makefile has such a target.
+   * dh\_auto\_clean: New program, automates running make clean (or distclean,
+     or realclean), or using setup.py to clean up.
+   * dh\_auto\_install: New program, automates running make install, or using
+     setup.py to install. Supports the PREFIX=/usr special case needed by
+     MakeMaker Makefiles. (Support for cmake and other build systems planned
+     but not yet implemented.)
+   * New v7 mode, which only has three changes from v6, and is the new
+     recommended default, especially when using dh.
+   * dh\_install: In v7 mode, if --sourcedir is not specified, first look for
+     files in debian/tmp, and then will look in the current directory. This
+     allows dh\_install to interoperate with dh\_auto\_install without needing any
+     special parameters.
+   * dh\_clean: In v7 mode, read debian/clean and delete all files listed
+     therein.
+   * dh\_clean: In v7 mode, automatically delete *-stamp files.
+   * Add a Makefile and simplify this package's own rules file using
+     all the new toys.
+   * dh\_clean: Don't delete core dumps. (Too DWIM, and "core" is not
+     necessarily a core dump.) Closes: #[477391](http://bugs.debian.org/477391)
+   * dh\_prep: New program, does the same as dh\_clean -k (which will be
+     deprecated later)."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.1.mdwn b/code/debhelper/news/version_7.0.1.mdwn
deleted file mode 100644
index 419b537..0000000
--- a/code/debhelper/news/version_7.0.1.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-debhelper 7.0.1 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * I lied, one more v7 change slipped in..
-   * dh\_installchangelogs: In v7 mode, if no upstream changelog is specified,
-     and the package is not native, guess at a few common changelog filenames."""]]
\ No newline at end of file

diff --git a/code/debhelper/news/version_6.0.10.mdwn b/code/debhelper/news/version_6.0.10.mdwn
deleted file mode 100644
index 8c8ad36..0000000
--- a/code/debhelper/news/version_6.0.10.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-debhelper 6.0.10 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * dh\_perl: Remove empty directories created by MakeMaker."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_6.0.11.mdwn b/code/debhelper/news/version_6.0.11.mdwn
deleted file mode 100644
index 07f47aa..0000000
--- a/code/debhelper/news/version_6.0.11.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-debhelper 6.0.11 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh\_installman: man --recode transparently uncompresses compressed
-     pages. So when saving the output back, save it to a non-compressed
-     filename (and delete the original, compressed file). Closes: #[470913](http://bugs.debian.org/470913)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_6.0.12.mdwn b/code/debhelper/news/version_6.0.12.mdwn
deleted file mode 100644
index 0557747..0000000
--- a/code/debhelper/news/version_6.0.12.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-debhelper 6.0.12 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh\_icons: Support .xpm format icons. Stop looking for .jpg icons, and
-     also, for compleness, support .icon files. This matches the set of
-     extensions supported by gtk-update-icon-cache. Closes: #[448094](http://bugs.debian.org/448094)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_6.0.8.mdwn b/code/debhelper/news/version_6.0.8.mdwn
deleted file mode 100644
index b70550b..0000000
--- a/code/debhelper/news/version_6.0.8.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-debhelper 6.0.8 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * dh\_installman: Convert all man pages in the build directory to utf-8, not
-     just those installed by the program."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_6.0.9.mdwn b/code/debhelper/news/version_6.0.9.mdwn
deleted file mode 100644
index bef1f44..0000000
--- a/code/debhelper/news/version_6.0.9.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-debhelper 6.0.9 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh\_installman: Don't recode symlinks. Closes: #[471196](http://bugs.debian.org/471196)"""]]
\ No newline at end of file

diff --git a/blog/entry/dh_implementation/discussion.mdwn b/blog/entry/dh_implementation/discussion.mdwn
new file mode 100644
index 0000000..2ebf80d
--- /dev/null
+++ b/blog/entry/dh_implementation/discussion.mdwn
@@ -0,0 +1,2 @@
+Debhelper news v7.0.0 is mysteriously missing from the wiki.
+--ulrik

diff --git a/code/debhelper/news/version_7.0.0.mdwn b/code/debhelper/news/version_7.0.0.mdwn
deleted file mode 100644
index 9c2a24c..0000000
--- a/code/debhelper/news/version_7.0.0.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-debhelper 7.0.0 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh: New program that runs a series of debhelper commands in a sequence.
-     This can be used to construct very short rules files (as short as 3
-     lines), while still exposing the full power of debhelper when it's
-     needed.
-   * dh\_auto\_configure: New program, automates running ./configure,
-     Makefile.PL, and python distutils. Calls them with exactly the same
-     options as cdbs does by default, and allows adding/overriding options.
-   * dh\_auto\_build: New program, automates building the package by either
-     running make or using setup.py. (Support for cmake and other build systems
-     planned but not yet implemented.)
-   * dh\_auto\_test: New program, automates running make test or make check
-     if the Makefile has such a target.
-   * dh\_auto\_clean: New program, automates running make clean (or distclean,
-     or realclean), or using setup.py to clean up.
-   * dh\_auto\_install: New program, automates running make install, or using
-     setup.py to install. Supports the PREFIX=/usr special case needed by
-     MakeMaker Makefiles. (Support for cmake and other build systems planned
-     but not yet implemented.)
-   * New v7 mode, which only has three changes from v6, and is the new
-     recommended default, especially when using dh.
-   * dh\_install: In v7 mode, if --sourcedir is not specified, first look for
-     files in debian/tmp, and then will look in the current directory. This
-     allows dh\_install to interoperate with dh\_auto\_install without needing any
-     special parameters.
-   * dh\_clean: In v7 mode, read debian/clean and delete all files listed
-     therein.
-   * dh\_clean: In v7 mode, automatically delete *-stamp files.
-   * Add a Makefile and simplify this package's own rules file using
-     all the new toys.
-   * dh\_clean: Don't delete core dumps. (Too DWIM, and "core" is not
-     necessarily a core dump.) Closes: #[477391](http://bugs.debian.org/477391)
-   * dh\_prep: New program, does the same as dh\_clean -k (which will be
-     deprecated later)."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.1.mdwn b/code/debhelper/news/version_7.0.1.mdwn
new file mode 100644
index 0000000..419b537
--- /dev/null
+++ b/code/debhelper/news/version_7.0.1.mdwn
@@ -0,0 +1,5 @@
+debhelper 7.0.1 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * I lied, one more v7 change slipped in..
+   * dh\_installchangelogs: In v7 mode, if no upstream changelog is specified,
+     and the package is not native, guess at a few common changelog filenames."""]]
\ No newline at end of file

diff --git a/blog/entry/dh_implementation.mdwn b/blog/entry/dh_implementation.mdwn
index 6035999..c79136c 100644
--- a/blog/entry/dh_implementation.mdwn
+++ b/blog/entry/dh_implementation.mdwn
@@ -7,13 +7,13 @@ packages will be added as bugs are filed about them.
 I've uploaded a few of my own packages converted to use debhelper 7 with
 minimised rules files, so there are a range of examples in incoming:
 
-* mr uses a very simple makefile, and a 3 line debian/rules
-* aalib uses automake and autoconf, and is a library package of average
+* `mr` uses a very simple makefile, and a 3 line debian/rules
+* `aalib` uses automake and autoconf, and is a library package of average
   complexity. The rules file is minimised where possible using `dh`, but
   still does complex things in its build and install targets. It's also a
   good example of how to set up a `-dbg` package when using `dh`, and of
   how to set up /usr/share/doc symlinks between packages when using `dh`.
-* The libaudio-mpd-perl is an example of a perl module package using dh.
+* `libaudio-mpd-perl` is an example of a perl module package using dh.
   It shows how to override dh default behavior in two ways: Skipping
   running `dh_auto_test`, and passing a changelog filename to
   `dh_installchangelogs`.

diff --git a/blog/entry/dh_implementation.mdwn b/blog/entry/dh_implementation.mdwn
new file mode 100644
index 0000000..6035999
--- /dev/null
+++ b/blog/entry/dh_implementation.mdwn
@@ -0,0 +1,21 @@
+I've implemented last night's design, in [[code/debhelper]] 7.0.0.
+
+Currently fully supported are packages that use the autotools, or perl's
+MakeMaker, or python setup.py, or a simple Makefile. The other classes of
+packages will be added as bugs are filed about them.
+
+I've uploaded a few of my own packages converted to use debhelper 7 with
+minimised rules files, so there are a range of examples in incoming:
+
+* mr uses a very simple makefile, and a 3 line debian/rules
+* aalib uses automake and autoconf, and is a library package of average
+  complexity. The rules file is minimised where possible using `dh`, but
+  still does complex things in its build and install targets. It's also a
+  good example of how to set up a `-dbg` package when using `dh`, and of
+  how to set up /usr/share/doc symlinks between packages when using `dh`.
+* The libaudio-mpd-perl is an example of a perl module package using dh.
+  It shows how to override dh default behavior in two ways: Skipping
+  running `dh_auto_test`, and passing a changelog filename to
+  `dh_installchangelogs`.
+
+Early adopters, have at it!