diff --git a/blog/entry/a_year_of_haskell___40__not_really__41__.mdwn b/blog/entry/a_year_of_haskell___40__not_really__41__.mdwn
new file mode 100644
index 0000000..bb7a799
--- /dev/null
+++ b/blog/entry/a_year_of_haskell___40__not_really__41__.mdwn
@@ -0,0 +1,25 @@
+Guess it's really been longer than a year that [[haskell]] has been on my
+mind, though not much lately. Things are aligning again. I'll shortly be
+visiting the Bay Area again -- last time I piled up haskell documentation
+for the plane trip. This time I'm looking forward to the Real World Haskell
+book waiting in the mailbox when I get back.
+
+I read and commented on the first several draft chapters, hoping my
+ignorance would be useful, and I know one of the authors (though if I'm not
+mistaken I've never met him). So I'm looking forward to reading it, but
+also feeling guilty that I haven't managed to do anything serious with
+haskell yet. No new project that I dared, or had the patience, to attempt
+in it. But that's what the book's supposed to solve. Getting over the gap
+from a basic understanding to being able to add the language as another
+tool in the kit.
+
+And hey, it's better than seriously learning javascript would be, right?
+
+---
+
+Right now I can't think about haskell without thinking about Buddhism.
+I won't bore you with why
+[they're](http://changelog.complete.org/archives/814-real-world-haskell-update)
+[connected](http://changelog.complete.org/archives/779-education)
+[in my](http://www.eyrie.org/~eagle/journal/2008-11/018.html)
+[head](http://www.last.fm/music/Prof.+Malcolm+David+Eckel/+listeners).

diff --git a/blog/entry/awesomely_frustrated/discussion.mdwn b/blog/entry/awesomely_frustrated/discussion.mdwn
index 416b654..2b2ede8 100644
--- a/blog/entry/awesomely_frustrated/discussion.mdwn
+++ b/blog/entry/awesomely_frustrated/discussion.mdwn
@@ -7,3 +7,22 @@ Add to the list: Can't figure out how to duplicate tag 0 functionality.  sigh.
 ---
 
 The awesome mailing list is a great place to bring stuff like this up. It's a pretty young project still. Julien is pretty open to adding new features if they are good ones...
+
+---
+
+Ok, finally duplicated sending a window to all (numeric) tags:
+
+    keybinding({ modkey, "Control", "Shift" }, 0,
+    	   function ()
+    	      if client.focus then
+    		 t = awful.tag.selected(client.focus.screen)
+    		 for i = 1, keynumber do
+    		    st = tags[client.focus.screen][i]
+    		    if st and t ~= st then
+    		       awful.client.toggletag(tags[client.focus.screen][i])
+    		    end
+    		 end
+    	      end
+    	   end):add()
+
+(and wtf? I can't type a tab in FF?  augh.)

diff --git a/blog/entry/spelling_policy.mdwn b/blog/entry/spelling_policy.mdwn
new file mode 100644
index 0000000..8de0298
--- /dev/null
+++ b/blog/entry/spelling_policy.mdwn
@@ -0,0 +1,17 @@
+Effective immediatly -- 
+
+If you're annoyed by the spelling of something I've written,
+I will accept a patch -- preferably generated by `git-format-patch`,
+but `diff -u` is also acceptable. 
+
+Any other communication about spelling mistakes will be ignored,
+unless the mistake has ramifications that will cause undue pain and
+suffering to people who are not English majors.
+
+Furthermore, if the spelling "mistake" is that I spelled "-ize"
+as "-ise", it's not a mistake -- I prefer to use the latter form
+for obscure reasons, with a few exceptions.
+
+PS, 
+I realise that these are entirely arbitrary rules forced upon you
+willy-nilly. Teh irony..

diff --git a/blog/entry/too_cute_not_to_blog.mdwn b/blog/entry/too_cute_not_to_blog.mdwn
new file mode 100644
index 0000000..82529c6
--- /dev/null
+++ b/blog/entry/too_cute_not_to_blog.mdwn
@@ -0,0 +1,5 @@
+[[!img pics/KaiSango_HW_01.jpg caption="my great-niece Sango & great-nephew Kai"]]
+
+By way of Tomoko and Mom.
+
+[[!tag lay family]]
diff --git a/blog/pics/KaiSango_HW_01.jpg b/blog/pics/KaiSango_HW_01.jpg
new file mode 100644
index 0000000..93c34f6
Binary files /dev/null and b/blog/pics/KaiSango_HW_01.jpg differ

diff --git a/boxen/stick.mdwn b/boxen/stick.mdwn
index 65cb531..4357a3f 100644
--- a/boxen/stick.mdwn
+++ b/boxen/stick.mdwn
@@ -1,2 +1,4 @@
 Stick is the nslu2 at Anna's. Connected to [[fly]] and serving as the
 dial-up gateway. Running off a USB stick, thus the name.
+
+(Now retired.)

diff --git a/blog/entry/electic_bike.mdwn b/blog/entry/electic_bike.mdwn
index f0f09db..d49326f 100644
--- a/blog/entry/electic_bike.mdwn
+++ b/blog/entry/electic_bike.mdwn
@@ -1,15 +1,17 @@
-I decided to get an electic bike when my [[car_died|vacation]]. Couldn't
+[[meta title="electric bike"]]
+
+I decided to get an eletric bike when my [[car_died|vacation]]. Couldn't
 quite stomach buying a new gasoline vehicle at this point in time, didn't
-really feel like another used car, and the available electic cars are still
+really feel like another used car, and the available eletric cars are still
 too new/expensive/hard to find. While there are some neat NEVs that are not
-too expensive, they're too limited to be worth my money, and electic bikes
-fit into the same general niche. (So do electic scooters, but I didn't want
+too expensive, they're too limited to be worth my money, and eletric bikes
+fit into the same general niche. (So do eletric scooters, but I didn't want
 to spend that much money on an experiment..)
 
 My first try was a disaster. I was thinking that a large cargo capacity
 would be a good thing, so I gravitated toward trikes. However, the one I
 tried turned out to be a lemon in several ways, and suffered a catastropic
-and dangerous controller burnout. So I learned that this electic bike
+and dangerous controller burnout. So I learned that this eletric bike
 industry is pretty rough and ready with a lot of junk to avoid. I also
 learned that I don't enjoy riding trikes.
 
@@ -23,7 +25,7 @@ has a good derailer, and rides well. I'm no expert but it seems about as
 good as the bike I used to commute with, though the frame is a bit heavier.
 (IIRC, it was also at least $200 *cheaper* than that bike!)
 
-On the electic side, it has a relatively small and light lithium ion
+On the eletric side, it has a relatively small and light lithium ion
 battery; the motor is mounted in the hub. It's strong enough to go up hills
 on its own if you really want it to, but you will end up pedaling to
 assist, which is good.
@@ -33,7 +35,7 @@ faster gear, to be able to assist the motor more at high speed. I haven't
 wanted a lower gear yet, but I've not tried to do any hills without the
 motor's help.
 
-The electic controls are ok, but not perfect. I worry about accidentially
+The eletric controls are ok, but not perfect. I worry about accidentially
 twisting the throttle, although it has to be turned quite far to engage the
 motor.
 

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index 0a5942f..e23da8c 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -4,3 +4,7 @@ Thanks again.
 ==
 
 Oops, it just saved my butt again.  I swear I'll try not to append to this comment every time it proves useful ...
+
+==
+
+Hey, I was wondering if there's any intention to support subversion?

diff --git a/blog/entry/pears_and_pets.mdwn b/blog/entry/pears_and_pets.mdwn
new file mode 100644
index 0000000..1fa49dd
--- /dev/null
+++ b/blog/entry/pears_and_pets.mdwn
@@ -0,0 +1,23 @@
+What I've been up to the past few days, other than nervously refreshing
+polling and sites over and over..
+
+[Like Anna](http://waldeneffect.org/blog/Winner_and_wildcrafting/) I
+skulked around an abandoned farmhouse yesterday, and found a pear windfall.
+(Better than expected pears too.) Actually, the farm turns out to not be
+abandoned, the fireplace had hot coals in it. Been too long since I was out
+there, and in touch with what's going on.
+
+Found the [At Play](http://www.gamesetwatch.com/column_at_play/) column by
+John Harris, full of enthusiastic writing about rogue-like games.
+
+Inspired by that I dusted off my nethack fingers. I basically suck at
+nethack, but still dream of ascending one decade. But playing it on a laptop
+is such a pain. I tossed together 
+[this script](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/keyhack) to
+let me use the arrow keys with nethack, rather than `hjkl`, because vim has
+ruined me.
+
+Oh, and I've been making salsa with the last of the summer tomatoes,
+as they ripen.
+
+[[tag lay games]]

diff --git a/blog/entry/OpenID/discussion.mdwn b/blog/entry/OpenID/discussion.mdwn
index 8949dcf..407b1ee 100644
--- a/blog/entry/OpenID/discussion.mdwn
+++ b/blog/entry/OpenID/discussion.mdwn
@@ -26,3 +26,7 @@ Apologies if this is the wrong place to report such things.
 > > It's at <http://www.openidenabled.com/software/pyblosxom/pyblosxom-server>.
 > > I'm authenticating against my own blog instance at <http://blog.mwolson.org>.
 > > --Michael Olson
+
+I'm seeing the same error message as above - interesting is, that I can login to your wiki but not to mine ;)
+
+[Guido Günther](http://honk.sigxcpu.org)

diff --git a/code/moreutils/news/version_0.28.mdwn b/code/moreutils/news/version_0.28.mdwn
deleted file mode 100644
index 5503b7c..0000000
--- a/code/moreutils/news/version_0.28.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-moreutils 0.28 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Moved to a git repository.
-   * vidir: Applied patch from Stefan Fritsch (one part of #[412176](http://bugs.debian.org/412176)):
-     - Check for control characters (especially newlines) in filenames
-       and error out, since this can greatly confuse the editor or vidir.
-     - If the source of a rename does not exist (and thus the rename will fail
-       anyway), vidir should not move an existing target file to a tmpfile.
-     - If a directory is renamed, vidir should take that into account when
-       renaming files in this directory.
-     - If a directory name is passed as name/ to vidir, vidir should not
-       add second slash after the name.
-   * vidir: Add support for unlinking directories. To recursivly delete
-     a directory and its contents, pipe find to vidir, and delete the directory
-     and its contents in the editor. Closes: #[412176](http://bugs.debian.org/412176)
-   * Add example to man page about recursive modification of directories.
-     Closes: #[390099](http://bugs.debian.org/390099)"""]]
\ No newline at end of file
diff --git a/code/moreutils/news/version_0.33.mdwn b/code/moreutils/news/version_0.33.mdwn
new file mode 100644
index 0000000..beee4ea
--- /dev/null
+++ b/code/moreutils/news/version_0.33.mdwn
@@ -0,0 +1,4 @@
+moreutils 0.33 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Support installing moreutils into prefixes other than /usr (Evan Broder)
+   * Fix zrun breakage introduced last version. Closes: #[504129](http://bugs.debian.org/504129)"""]]
\ No newline at end of file

diff --git a/blog/entry/I_voted/discussion.mdwn b/blog/entry/I_voted/discussion.mdwn
index 42db2c2..312503d 100644
--- a/blog/entry/I_voted/discussion.mdwn
+++ b/blog/entry/I_voted/discussion.mdwn
@@ -19,4 +19,6 @@ Cheers, Phil.
 > have stamped it that morning, or done so w/o me noticing. It's also
 > possible they're printing the ballots on the fly, if so the stub might
 > always have the current date. They _may_ have checked this, quickly,
-> before waving me on the the voting machine. --[[Joey]]
+> before waving me on the the voting machine. *But*, I don't see how that would
+> let them check that the ballot I turned in was the one matching the stub.
+> --[[Joey]]

diff --git a/blog/entry/I_voted/discussion.mdwn b/blog/entry/I_voted/discussion.mdwn
index c36e16e..42db2c2 100644
--- a/blog/entry/I_voted/discussion.mdwn
+++ b/blog/entry/I_voted/discussion.mdwn
@@ -13,3 +13,10 @@ In the UK, the people running the ballot stamp the voting papers on the back as
 It is not clear from your post if this fraud would be viable in the system you just used.
 
 Cheers, Phil.
+
+> They did remove a stub from the ballot and attach it to the registration
+> form. I forgot to look at the stub to see what the point was. They may
+> have stamped it that morning, or done so w/o me noticing. It's also
+> possible they're printing the ballots on the fly, if so the stub might
+> always have the current date. They _may_ have checked this, quickly,
+> before waving me on the the voting machine. --[[Joey]]

diff --git a/blog/entry/I_voted/discussion.mdwn b/blog/entry/I_voted/discussion.mdwn
index 25c31a4..c36e16e 100644
--- a/blog/entry/I_voted/discussion.mdwn
+++ b/blog/entry/I_voted/discussion.mdwn
@@ -5,7 +5,7 @@ One form of fraud that many people are unaware of and is often possible in paper
 1. steal a blank voting form, and fill it in as the vote buyer prefers
 1. give that to a prospective vote seller
 1. the seller then goes in to vote, and swaps the pre-filled and blank forms in the privacy of the voting booth.
-1. the seller the returns to the buyer, and sells them the next blank ballot
+1. the seller then returns to the buyer, and sells them the next blank ballot
 1. repeat (in parallel) from step 1.
 
 In the UK, the people running the ballot stamp the voting papers on the back as they hand them out in a way that allows them to recognise how long ago a ballot was handed out, and the folded paper is checked before it's allowed into the ballot box.

diff --git a/blog/entry/I_voted/discussion.mdwn b/blog/entry/I_voted/discussion.mdwn
new file mode 100644
index 0000000..25c31a4
--- /dev/null
+++ b/blog/entry/I_voted/discussion.mdwn
@@ -0,0 +1,15 @@
+Hi Joey,
+
+One form of fraud that many people are unaware of and is often possible in paper voting systems is the selling of votes as follows:
+
+1. steal a blank voting form, and fill it in as the vote buyer prefers
+1. give that to a prospective vote seller
+1. the seller then goes in to vote, and swaps the pre-filled and blank forms in the privacy of the voting booth.
+1. the seller the returns to the buyer, and sells them the next blank ballot
+1. repeat (in parallel) from step 1.
+
+In the UK, the people running the ballot stamp the voting papers on the back as they hand them out in a way that allows them to recognise how long ago a ballot was handed out, and the folded paper is checked before it's allowed into the ballot box.
+
+It is not clear from your post if this fraud would be viable in the system you just used.
+
+Cheers, Phil.

diff --git a/blog/entry/I_voted.mdwn b/blog/entry/I_voted.mdwn
new file mode 100644
index 0000000..816deaa
--- /dev/null
+++ b/blog/entry/I_voted.mdwn
@@ -0,0 +1,96 @@
+I voted early because Sullivan County, TN is phasing in new voting
+machines this election. On election day, they will use the old touch screen
+system, while early voters get to test the "new" paper system.
+
+The new system is sure to please fans of paper. However, it has two flaws
+that were obvious to me. I have no way of knowing that my vote will be
+counted as I filled it out, and I realized half way through that election
+officials can determine how *I* voted. Here's why...
+
+You have two pieces of paper during the vote. A registration sheet is
+signed by the voter. A paper ballot has little rectangles that the votor fills
+in with a ballpoint pen in the privacy of the voting booth. The instructions
+say to fill in choices completely. Since the voting booths have a hard top,
+it's difficult to write on them with a ballpoint, let alone fill in little
+squares completely. The natural thing to do? Slide your second piece of paper
+under the ballot, so the pen can dig in better. If you don't think about it,
+you'll probably do this unconciously.
+
+Half-way through, I realized that I was leaving imprints on the registration
+paper, with my name on it, that corresponded to my choices on the ballot. Due
+to the two-column layout, and the distinctive spacing between different
+choices, it's possible to look at those imprints and determine exactly how I
+voted. The registration paper has to be handed in at the end, so the official
+who sits there all day collecting these has plenty of time to work this out and
+determine the votes of anyone. (I moved my ballot around and re-filled in squares
+to try to confuse things.)
+
+(Relatedly, one has to carry the paper ballot around the room to take it to
+the voting machine. It's difficult to keep the ballot obscured while doing
+this, since you can't fold it, and since they take the registration paper
+before the ballot, so you can't keep the ballot covered with it either.)
+
+The second obvious flaw is that once I fed my ballot into the voting
+machine, which presumably scanned it and put it in a safe, there was only a
+confimation that "you've voted!". There was no way to verify that it had
+counted my vote as I'd marked it.
+
+----
+
+Most voting system work seems to be in the direction of advocating paper
+ballots for paper ballots' sake. This doesn't seem like the right approach to
+me. Is no-one working on writing down the characteristics that an ideal voting
+system would have, and trying to make them all *requirements*?
+
+My take on requirements of an ideal voting system are:
+
+1. Only living people in the set of registered voters may vote.
+2. Each votor can only vote once.
+3. The votor should be able to verify that his vote was counted correctly.
+4. There must be a way for the votor to prove if his vote was not counted.
+5. The votor must not be able to prove which way he voted
+   (to avoid payoffs, intimidation, etc).
+6. Others must not be able to determine how a votor voted.
+7. Individual votes must be retained to allow recounts.
+8. The entire vote data should be published so that the results can be
+   verified by third parties.
+9. The system must scale to many millions of voters.
+10. The correctness of the entire voting system should be formally provable.
+
+The paper ballot system I experienced today fails on at least points #2 [A] , #3
+(see above), #4 (I walked away with nothing I can use to prove anything), #5 (I
+can video my vote), #6 (see above), and #8 [B]. At least it scales
+well though.
+
+The old touch screen system failed most of the same points, though it made at
+least a small attempt to satisfy #3 (by confirming the vote onscreen) -- and it
+failed #7, and probably scaled worse.
+
+Outside of the American election system, I've participated in voting systems
+that seem able meet requirements #1 [C], #2, #3, #4, #7, #8, and #10.
+
+To me, #10 is the most important point, but it seems to be the one that is
+neglected most. Some of the points may be worth weakening if they block other
+points. Is it really worth avoiding giving me something to prove how I've
+voted, and banning taking cameras into the polling place, in order to meet
+point #5, if this defeats point #4?
+
+I'm curious what requirments I may have left out too. My list is just a rough
+stab at it. The real point is to *analyze* voting systems, and reject ones that
+don't provably meet criteria. Until it becomes accepted practice to do that,
+our voting systems will not get appreciably less flawed.
+
+----
+
+[A] If you can get two copies of the ballot, you can vote twice ... fairly
+    easy with a friend on the inside to arrange for the two copies to get "stuck
+    together", and another one at the vote scanner to allow you to scan both.
+
+[B] The ballots could be published, but there's no way to prove all of them,
+    or the true ballots would be. And in reality, they're either shredded, or
+    locked away, or tossed in a dumpster, or variously all three.
+
+[C] Mostly. Perfectly accomplishing #1 is harder than most of the other points,
+    and may be worth leaving out of scope.
+
+[[!tag lay vote]]

diff --git a/code/moreutils/news/version_0.26.mdwn b/code/moreutils/news/version_0.26.mdwn
deleted file mode 100644
index d352c3f..0000000
--- a/code/moreutils/news/version_0.26.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-moreutils 0.26 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * isutf8: Correct inverted exit code when passed a file to check.
-     Closes: #[453306](http://bugs.debian.org/453306)"""]]
\ No newline at end of file
diff --git a/code/moreutils/news/version_0.32.mdwn b/code/moreutils/news/version_0.32.mdwn
new file mode 100644
index 0000000..7f9d83e
--- /dev/null
+++ b/code/moreutils/news/version_0.32.mdwn
@@ -0,0 +1,6 @@
+moreutils 0.32 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * zrun: Can be linked to zsomeprog to run the equivilant of zrun someprog.
+     Closes: #[411623](http://bugs.debian.org/411623) (Stefan Fritsch)
+   * zrun: Add support for lzma and lzo. (Stefan Fritsch)
+   * Fix pod error in vidir(1)."""]]
\ No newline at end of file

diff --git a/code/filters/news/version_2.41.mdwn b/code/filters/news/version_2.41.mdwn
deleted file mode 100644
index 2470a3c..0000000
--- a/code/filters/news/version_2.41.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-filters 2.41 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * pirate: Roll r's. Also, conjugate 'is' in first person, and add some
-     more phrases. Closes: #[443213](http://bugs.debian.org/443213)"""]]
\ No newline at end of file
diff --git a/code/filters/news/version_2.46.mdwn b/code/filters/news/version_2.46.mdwn
new file mode 100644
index 0000000..57d03eb
--- /dev/null
+++ b/code/filters/news/version_2.46.mdwn
@@ -0,0 +1,3 @@
+filters 2.46 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * fanboy: Improve docs and remove from SAMPLES. Closes: #[496588](http://bugs.debian.org/496588)"""]]
\ No newline at end of file

diff --git a/code/alien/news/version_8.68.mdwn b/code/alien/news/version_8.68.mdwn
deleted file mode 100644
index 7273234..0000000
--- a/code/alien/news/version_8.68.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-alien 8.68 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Show output of installation of package with -i, since some packages
-     install scripts may have important output or even be interactive.
-     Closes: #[425732](http://bugs.debian.org/425732)"""]]
\ No newline at end of file
diff --git a/code/alien/news/version_8.73.mdwn b/code/alien/news/version_8.73.mdwn
new file mode 100644
index 0000000..ce0bb56
--- /dev/null
+++ b/code/alien/news/version_8.73.mdwn
@@ -0,0 +1,4 @@
+alien 8.73 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix pkg generation to not include /prototype in all packages.
+     (Kim Bisgaard)"""]]
\ No newline at end of file

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 2db73fa..de157da 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-Testing 1 2 3 4!
+Testing 1 2 3 4 5!

diff --git a/sandbox.mdwn b/sandbox.mdwn
index d9e0058..2db73fa 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-Testing 1 2 3!
+Testing 1 2 3 4!

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 4bffec0..d9e0058 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-Testing 1 2 3 4 5!!
+Testing 1 2 3!

diff --git a/blog/entry/anonymous_git_push_to_ikiwiki.mdwn b/blog/entry/anonymous_git_push_to_ikiwiki.mdwn
index 04613b8..83aa44d 100644
--- a/blog/entry/anonymous_git_push_to_ikiwiki.mdwn
+++ b/blog/entry/anonymous_git_push_to_ikiwiki.mdwn
@@ -11,7 +11,7 @@ it, and push it back? Now you can!
 	git commit -a -m "I'm in your git, editing your wiki."
 	git push
 
-The secrect sauce, that makes this not a recipe for disaster but just a
+The secret sauce, that makes this not a recipe for disaster but just a
 nice feature, is that ikiwiki checks each change as it's pushed in, and
 rejects any changes that couldn't be made to the wiki with a web browser.
 

diff --git a/blog/entry/anonymous_git_push_to_ikiwiki.mdwn b/blog/entry/anonymous_git_push_to_ikiwiki.mdwn
new file mode 100644
index 0000000..04613b8
--- /dev/null
+++ b/blog/entry/anonymous_git_push_to_ikiwiki.mdwn
@@ -0,0 +1,19 @@
+So, [[code/ikiwiki]] keeps wikis in git. But until today, that's only
+meant that the wiki's owners can edit it via git. Everyone else was stuck
+using the web interface.
+
+Wouldn't it be nice then if anyone could check out the wiki source, modify
+it, and push it back? Now you can!
+
+	git clone git://git.ikiwiki.info/
+	cd git.ikiwiki.info
+	vim doc/sandbox.mdwn
+	git commit -a -m "I'm in your git, editing your wiki."
+	git push
+
+The secrect sauce, that makes this not a recipe for disaster but just a
+nice feature, is that ikiwiki checks each change as it's pushed in, and
+rejects any changes that couldn't be made to the wiki with a web browser.
+
+So if you use ikiwiki for a wiki, you might want to
+[turn on untrusted git push](http://ikiwiki.info/tips/untrusted_git_push/).

diff --git a/blog/entry/anatomy_of_an_atrocious_announcement.mdwn b/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
index 3438792..bdea811 100644
--- a/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
+++ b/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
@@ -35,7 +35,7 @@ So you might say ...
 Sure, the whole project voted for this, and so you should be sure to allude
 to that vote somewhere else. Maybe in a different paragraph entirely, you
 could refer to "Debian Maintainers (DM) [GR-DM]". (It would be excessive to
-have that footnote refer to a bogus url like "http://vote.debian.org/something".)
+have that footnote refer to a bogus url like <http://vote.debian.org/something>.)
 
 ## the big lie
 

diff --git a/blog/entry/anatomy_of_an_atrocious_announcement.mdwn b/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
index 889c8dc..3438792 100644
--- a/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
+++ b/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
@@ -34,9 +34,8 @@ So you might say ...
 ... Thus implying that this was a few malcontents who should be ignored.
 Sure, the whole project voted for this, and so you should be sure to allude
 to that vote somewhere else. Maybe in a different paragraph entirely, you
-could refer to "Debian Maintainers (DM) [GR-DM]". Just to be extra cunning,
-make sure the footnote is useless by referring to a bogus url like
-"http://vote.debian.org/something".
+could refer to "Debian Maintainers (DM) [GR-DM]". (It would be excessive to
+have that footnote refer to a bogus url like "http://vote.debian.org/something".)
 
 ## the big lie
 

diff --git a/blog/entry/anatomy_of_an_atrocious_announcement.mdwn b/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
new file mode 100644
index 0000000..889c8dc
--- /dev/null
+++ b/blog/entry/anatomy_of_an_atrocious_announcement.mdwn
@@ -0,0 +1,68 @@
+Here are some tricks that you can use to ensure that your announcement to
+debian-devel-announce has maximal negative utility.
+
+## hide who's talking
+
+Make sure that your announcement does not start off by making clear who's
+speaking. The announcement will have a From line with your name on it, and
+that's good enough. Everyone knows who you are, what groups you're a member
+of, and can guess what group you're speaking for ... or whether you're just
+speaking for yourself. 
+
+Throughout the annoucement, be use to use terms like "We plan", "let us
+describe", "we are considering", "This is where our proposal comes in.", etc.
+
+Maybe in a footnote include a clue such as a mention of "the NM-Committee",
+but be sure to not *sign* the announcement with the name of any group or
+team or set of people, so that the reader is left guessing about who this
+"we" is all the way to the end and beyond.
+
+(And hey, "cabal" is a fun word.)
+
+## weasel words
+
+Scatter throughout the announcement some vaguely worded digs at things you
+disagree with. The key here is to make clear what you really mean, while
+providing enough plausible deniability that you can deny having said it
+later. 
+
+So you might say ...
+
+> Some time ago a few Developers thus went and pushed forward the
+> "Debian Maintainer" status.
+
+... Thus implying that this was a few malcontents who should be ignored.
+Sure, the whole project voted for this, and so you should be sure to allude
+to that vote somewhere else. Maybe in a different paragraph entirely, you
+could refer to "Debian Maintainers (DM) [GR-DM]". Just to be extra cunning,
+make sure the footnote is useless by referring to a bogus url like
+"http://vote.debian.org/something".
+
+## the big lie
+
+Make sure that your announcement starts off all bright and cheery on the
+surface, with just a hint of deadly steel jaws underneath. Something like:
+
+> If you are an existing Debian Developer or Debian Maintainer, don't be
+> afraid, we are not going to take anything away from you.
+
+Natter on for many, many pages of trivilities, good ideas, bad ideas,
+half-baked ideas, conflicting acronyms, and useless footnotes.
+Then spring the trap:
+
+> In future this will be a list maintained by the NM-committee.
+> At the time of migrating from the old to the new way, Ftpmaster will
+> convert the existing DM-Upload-Allowed fields into that list, so there
+> should be no interruption in your ability to upload.
+
+And ability to upload is all that matters. Who cares about the regression
+back to the [[tyranny_of_unix_permissions|ending_the_tyranny_of_unix_permissions]]?
+Who cares that DDs won't be able to decide when they trust a DM to upload
+their package, or that DMs won't be able to sign up quickly and easily,
+or that DMs will have to petition a disinterested committe to change
+anything? 
+
+Nothing will have changed, nothing will be taken away, nothing to see here,
+move along: The big lie.
+
+[[!tag rant]]

diff --git a/blog/entry/debhelper_option_parsing_overhaul.mdwn b/blog/entry/debhelper_option_parsing_overhaul.mdwn
new file mode 100644
index 0000000..3b9b9e9
--- /dev/null
+++ b/blog/entry/debhelper_option_parsing_overhaul.mdwn
@@ -0,0 +1,19 @@
+I've been meaning to fix [[code/debhelper]]'s option parsing code for a
+while (7 years?!), and finally got around to it with version 7.1.0, in
+experimental.
+
+Now debhelper commands can define their own command-line options. This is
+especially useful for third-party commands that couldn't add new options
+before, without pestering or bribing me. (Bribes still happily accepted
+however.)
+
+It's in experimental because I *removed* global support for a large number
+of lesser-used options. Some of these might be used by third-party
+debhelper commands -- if so, they will be broken by this change, and need
+to define those options themselves.
+
+Also, it used to be possible to pass nonsensical options to a command, like
+"`dh_strip --include-conffiles --no-restart-on-upgrade`". To avoid breaking
+unknown numbers of packages that might do things like this, I've made
+debhelper start warning about such things. This warning will be converted
+to an error as soon as I dare.

diff --git a/code/debhelper/news/version_7.0.13.mdwn b/code/debhelper/news/version_7.0.13.mdwn
deleted file mode 100644
index e0a54a7..0000000
--- a/code/debhelper/news/version_7.0.13.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-debhelper 7.0.13 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh\_auto\_install: Rather than looking at the number of binary packages
-     being acted on, look at the total number of binary packages in the
-     source package when deciding whether to install to debian/package or
-     debian/tmp. This avoids inconsistencies when building mixed arch all+any
-     packages using the binary-indep and binary-arch targets.
-     Closes: #[487938](http://bugs.debian.org/487938)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.1.0.mdwn b/code/debhelper/news/version_7.1.0.mdwn
new file mode 100644
index 0000000..e650e84
--- /dev/null
+++ b/code/debhelper/news/version_7.1.0.mdwn
@@ -0,0 +1,24 @@
+debhelper 7.1.0 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * dh\_installchangelogs: Fall back to looking for changelog files ending
+     with ".txt". Closes: #[498460](http://bugs.debian.org/498460)
+   * dh\_gencontrol: Ensure misc:Depends is set in substvars to avoid dpkg
+     complaining about it when it's empty. Closes: #[498666](http://bugs.debian.org/498666)
+   * dh: Fix typo in example. Closes: #[500836](http://bugs.debian.org/500836)
+   * Allow individual debhelper programs to define their own special options
+     by passing a hash to init(), which is later passed on the Getopt::Long.
+     Closes: #[370823](http://bugs.debian.org/370823)
+   * Move many command-specific options to only be accepted by the command
+     that uses them. Affected options are:
+     -x, -r, -R, -l, -L, -m,
+     --include-conffiles, --no-restart-on-upgrade, --no-start,
+     --restart-after-upgrade, --init-script, --filename, --flavor, --autodest,
+     --libpackage, --add-udeb, --dpkg-shlibdeps-params,
+     --dpkg-gencontrol-params, --update-rcd-params, --major, --remove-d,
+     --dirs-only, --keep-debug, --version-info, --list-missing, --fail-missing,
+     --language, --until, --after, --before, --remaining, --with
+   * If any third-party debhelper commands use any of the above options,
+     they will be broken, and need to be changed to pass options to init().
+   * To avoid breaking rules files that pass options to commands that do not
+     use them, debhelper will now only warn if it encounters an unknown
+     option. This will be converted back to an error later."""]]
\ No newline at end of file

diff --git a/talks.mdwn b/talks.mdwn
index e15786f..532dfef 100644
--- a/talks.mdwn
+++ b/talks.mdwn
@@ -12,7 +12,7 @@ by others.
 
 * "Some bits about the Debian Installer"
   - co-presented with Holger Levsen, Christian Perrier, Frans Pop
-  - [slides](http://people.debian.org/~fjp/d-i/d-i_debconf5.pdf) (pdf)  
+  - [source for slides and paper](http://svn.debian.org/wsvn/d-i/trunk/installer/doc/talks/d-i_debconf5/)  
      (worth it if only for the "creeping red" world dominition slides)
   - [paper](http://people.debian.org/~fjp/d-i/d-i_debconf5_paper.html)
   - [video](http://meetings-archive.debian.net/pub/debian-meetings/2005/debconf5/mpeg/2005-07-15/07-Debian_Installer-Holger_Levsen_Joey_Hess_Christian_perrier_Frans_Pop.mpeg) (100+ mb)

diff --git a/talks.mdwn b/talks.mdwn
index 5eb96ae..e15786f 100644
--- a/talks.mdwn
+++ b/talks.mdwn
@@ -14,8 +14,6 @@ by others.
   - co-presented with Holger Levsen, Christian Perrier, Frans Pop
   - [slides](http://people.debian.org/~fjp/d-i/d-i_debconf5.pdf) (pdf)  
      (worth it if only for the "creeping red" world dominition slides)
-  - [Here we are](pics/debconf/5/dsc03359.jpg) at the last minute
-    developing the slides using wireless and svn.
   - [paper](http://people.debian.org/~fjp/d-i/d-i_debconf5_paper.html)
   - [video](http://meetings-archive.debian.net/pub/debian-meetings/2005/debconf5/mpeg/2005-07-15/07-Debian_Installer-Holger_Levsen_Joey_Hess_Christian_perrier_Frans_Pop.mpeg) (100+ mb)
 
@@ -27,11 +25,11 @@ by others.
 ## DebConf 6, Oaxtepec, Mexico
 
 * "Lightning Talks" (organiser)
-  - [paper](talks/lightning.tex)
-  - [slides](talks/lightning.sxi)
+  - [[paper|lightning.tex]]
+  - [[slides|lightning.sxi]]
   - [video](http://meetings-archive.debian.net/pub/debian-meetings/2006/debconf6/theora-small/2006-05-20/tower/Lightning_Talks-Joey_Hess.ogg) (97 mb)
-  - [[notes for my talk|talks/lightning-talk]]
-  - [[timekeeping program|talks/lightning.sh]]
+  - [[notes_for_my_talk|talks/lightning-talk]]
+  - [[timekeeping_program|talks/lightning.sh]]
     
     (Note that the timekeeping program uses xdaliclock with my `countdown`
     wrapper, which I keep in git

diff --git a/blog/entry/relative_dates_in_html/discussion.mdwn b/blog/entry/relative_dates_in_html/discussion.mdwn
index d752ce4..d12ad1c 100644
--- a/blog/entry/relative_dates_in_html/discussion.mdwn
+++ b/blog/entry/relative_dates_in_html/discussion.mdwn
@@ -1 +1,15 @@
 The [datetime design pattern](http://microformats.org/wiki/datetime-design-pattern) the microformats people came up with is similar, but uses ISO 8601 for the timestamp in the title attribute.
+
+> Use of an abbr element instead of a span will work, although there are
+> [accessability concerns](http://www.webstandards.org/2007/04/27/haccessibility/)
+> with using abbr in the way the microformat is using it.
+> 
+> My javascript code cannot currently parse 8601 dates. The nice thing
+> about the date format I'm using is it can piggyback on javascript's
+> built-in date parser.
+> 
+> Also, html 5 actually has a
+> [time element](http://www.w3.org/html/wg/html5/#the-time-element),
+> although it looks to me like there's no way to specify you want one
+> to be displayed as a relative date. (My javascript could be adapted to
+> handle them though.) --[[Joey]]

diff --git a/blog/entry/relative_dates_in_html/discussion.mdwn b/blog/entry/relative_dates_in_html/discussion.mdwn
new file mode 100644
index 0000000..d752ce4
--- /dev/null
+++ b/blog/entry/relative_dates_in_html/discussion.mdwn
@@ -0,0 +1 @@
+The [datetime design pattern](http://microformats.org/wiki/datetime-design-pattern) the microformats people came up with is similar, but uses ISO 8601 for the timestamp in the title attribute.

diff --git a/sandbox.mdwn b/sandbox.mdwn
index e2f5236..4bffec0 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-Testing 1 2 3 4!!
+Testing 1 2 3 4 5!!

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 571db1d..e2f5236 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-Testing 1 2 3!!
+Testing 1 2 3 4!!

diff --git a/blog/entry/relative_dates_in_html.mdwn b/blog/entry/relative_dates_in_html.mdwn
index 2a93d53..898a4d6 100644
--- a/blog/entry/relative_dates_in_html.mdwn
+++ b/blog/entry/relative_dates_in_html.mdwn
@@ -4,7 +4,7 @@ If html had such a tag, then browsers could display dates using your time
 zone, and in whatever format you like. Rather than in some random time
 zone, that is often not even shown, and some random format.
 
-My way to see a date is as relative date, such as "two days ago". With
+My fav way to see a date is as relative date, such as "two days ago". With
 a mouseover so I can see the exact, absolute date in the rare case I need
 it.
 

diff --git a/blog/entry/relative_dates_in_html.mdwn b/blog/entry/relative_dates_in_html.mdwn
new file mode 100644
index 0000000..2a93d53
--- /dev/null
+++ b/blog/entry/relative_dates_in_html.mdwn
@@ -0,0 +1,126 @@
+One of html's deficiencies is that it doesn't have a tag to mark up a date.
+
+If html had such a tag, then browsers could display dates using your time
+zone, and in whatever format you like. Rather than in some random time
+zone, that is often not even shown, and some random format.
+
+My way to see a date is as relative date, such as "two days ago". With
+a mouseover so I can see the exact, absolute date in the rare case I need
+it.
+
+It's possible to combine some javascript with html, so that, if
+javascript is available, a nicely formatted relative date is displayed. And
+with no javascript, an plain old absolute date is shown. Perhaps the
+cleanest way to do it is using html like this, combined with javascript
+that fires on page load, parses the date and replaces it with something nicer:
+
+	<span class="date">Fri Oct 17 16:17:02 2008 (EDT)</span>
+
+But you might want to avoid using the ugly machine-parseable date, since it
+will still display in any situation where javascript isn't available. To do
+that, I added an attribute containing the machine-parseable date. I chose
+to use the "title" attribute, so as a bonus you can hover over it to get
+a popup with the raw date.
+
+	<span class="date" title="Fri Oct 17 16:17:02 2008 (EDT)">Friday afternoon, October 17th</span>
+
+So, relatively clean html out of the way, now we just need some javascript
+to munge in the relative dates. There are various examples out there. The
+[best one](http://wonderfullyflawed.com/2008/05/16/javascript-relative-dates/),
+requires the prototype framework.
+
+I try to stay away from javascript frameworks, since I'm not a javascript
+programmer, and since I dislike page loads pulling in thousands of lines of
+irrelevant code. So I came up with my own more bare metal implementation,
+which handles both types of html above.
+
+You can see it in action on my website, or by enabling the relativedate
+plugin on your own [[code/ikiwiki]].
+
+(This code is in the public domain, but do note that I'm not a javascript
+programmer, really.)
+
+-----
+<pre>
+var dateElements;
+window.onload = getDates;
+
+function getDates() {
+	dateElements = getElementsByClass('date');
+	for (var i = 0; i < dateElements.length; i++) {
+		var elt = dateElements[i];
+		var title = elt.attributes.title;
+		var d = new Date(title ? title.value : elt.innerHTML);
+		if (! isNaN(d)) {
+			dateElements[i].date=d;
+			elt.title=elt.innerHTML;
+		}
+	}
+
+	showDates();
+}
+
+function showDates() {
+	for (var i = 0; i < dateElements.length; i++) {
+		var elt = dateElements[i];
+		var d = elt.date;
+		if (! isNaN(d)) {
+			elt.innerHTML=relativeDate(d);
+		}
+	}
+	setTimeout(showDates,30000); // keep updating every 30s
+}
+
+function getElementsByClass(cls, node, tag) {
+        if (document.getElementsByClass)
+                return document.getElementsByClass(cls, node, tag);
+        if (! node) node = document;
+        if (! tag) tag = '*';
+        var ret = new Array();
+        var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
+        var els = node.getElementsByTagName(tag);
+        for (i = 0; i < els.length; i++) {
+                if ( pattern.test(els[i].className) ) {
+                        ret.push(els[i]);
+                }
+        }
+        return ret;
+}
+
+var timeUnits = new Array;
+timeUnits['minute'] = 60;
+timeUnits['hour'] = timeUnits['minute'] * 60;
+timeUnits['day'] = timeUnits['hour'] * 24;
+timeUnits['month'] = timeUnits['day'] * 30;
+timeUnits['year'] = timeUnits['day'] * 364;
+var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute'];
+
+function relativeDate(date) {
+	var now = new Date();
+	var offset = date.getTime() - now.getTime();
+	var seconds = Math.round(Math.abs(offset) / 1000);
+
+	var ret = "";
+	var shown = 0;
+	for (i = 0; i < timeUnitOrder.length; i++) {
+		var unit = timeUnitOrder[i];
+		if (seconds >= timeUnits[unit]) {
+			var num = Math.floor(seconds / timeUnits[unit]);
+			seconds -= num * timeUnits[unit];
+			if (ret)
+				ret += "and ";
+			ret += num + " " + unit + (num > 1 ? "s" : "") + " ";
+
+			if (++shown == 2)
+				break;
+		}
+		else if (shown)
+			break;
+	}
+
+	if (! ret)
+		ret = "less than a minute "
+
+	return ret + (offset < 0 ? "ago" : "from now");
+}
+</pre>
diff --git a/languages.mdwn b/languages.mdwn
index 5d8d2b2..fb13b5a 100644
--- a/languages.mdwn
+++ b/languages.mdwn
@@ -80,6 +80,12 @@ low. I can understand all but the knottiest Makefiles, and have written
 some tricky ones myself, but I cannot yet program the towers of hanoi
 in it.
 
+1. _Javascript_ (learning) [1998]
+
+  A language that I despised for a long time. I've recently found value in
+  using it in small quantities. I've never read any docs, but it's easy
+  enough to pick up, being so similar to other C/Java like languages.
+
 1. _TCL_ (static) [1995]
 
   Shares many of the advantages and disadvantes of shell
@@ -106,12 +112,6 @@ memory of the basics. Objectivly, the language is
 primative, and limiting, but has some wonderful graphics
 and sound capabilities, for its time.
 
-1. _Javascript_ (learning) [1998]
-
-  A language that I despised for a long time. I've recently found value in
-  using it in small quantities. I've never read any docs, but it's easy
-  enough to pick up, being so similar to other C/Java like languages.
-
 1. _Visual basic_ (forgetting) [1993]
 
   I played with this language for 2 or 3 years, and

diff --git a/code/mr.mdwn b/code/mr.mdwn
index 63d2c82..06fde7c 100644
--- a/code/mr.mdwn
+++ b/code/mr.mdwn
@@ -19,7 +19,8 @@ of things it can do include:
 mr is available in git at `git://git.kitenet.net/mr`, or
 [in gitweb](http://git.kitenet.net/?p=mr.git). It's recently been added to
 Debian. If you want a tarball, the best place to get one if from
-<http://packages.debian.org/unstable/source/mr>.
+<http://packages.debian.org/unstable/source/mr>. Unofficial RPMs are
+provided by [Douglas E. Warner](http://www.silfreed.net/download/repo/packages/mr/).
 
 ## News
 

diff --git a/code/mr/news/version_0.30.mdwn b/code/mr/news/version_0.30.mdwn
deleted file mode 100644
index 9a9ee9d..0000000
--- a/code/mr/news/version_0.30.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-mr 0.30 released with [[toggle text="these changes"]]
-\[[toggleable text="""
- * [ martin f. krafft ]
-   * Several git-fake-bare improvements.
- * [ Joey Hess ]
-   * Fix mr -c <config> register. (Thanks, Daniel Bungert)"""]]
\ No newline at end of file
diff --git a/code/mr/news/version_0.35.mdwn b/code/mr/news/version_0.35.mdwn
new file mode 100644
index 0000000..05c9835
--- /dev/null
+++ b/code/mr/news/version_0.35.mdwn
@@ -0,0 +1,6 @@
+mr 0.35 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Warn if an include command fails nonzero. Closes: #[495306](http://bugs.debian.org/495306)
+   * Remove stray character in pod that uglified man page. Closes: #[495731](http://bugs.debian.org/495731)
+   * Create ~/.mrlog not world readable.
+   * Pass additional options to darcs push when pushing. Closes: #[495734](http://bugs.debian.org/495734)"""]]
\ No newline at end of file

diff --git a/blog/entry/NC_car_curse__44___part_4.mdwn b/blog/entry/NC_car_curse__44___part_4.mdwn
new file mode 100644
index 0000000..eae4f72
--- /dev/null
+++ b/blog/entry/NC_car_curse__44___part_4.mdwn
@@ -0,0 +1,20 @@
+I'm getting to the point that I fear driving in North Carolina, because an
+exceptional percentage of car breakdowns happen to me there. The most
+recent one actually didn't happen in state, I'd just passed the TN border
+and was coming down the exceedingly twisty road to Shady Valley when I lost
+the engine on Mom's car.
+
+About the time I gave up on letting it cool down and trying things, a white
+convertable pulled up and I got a lift down to Shady. Since this was a
+beautiful Sunday, the [country store](http://www.shadyvalleycountrystore.com/) there
+had at least 500 motorcycles out front. I borrowed one of the bikers' cell phones,
+called a tow, and sat in a rocker on the porch and watched the insanity for an hour.
+
+<img src="http://www.shadyvalleycountrystore.com/My_Homepage_Files/IMG_0.jpg">
+
+The good thing about driving old cars that sometimes break down is that you
+do get used to dealing with it. I actually enjoyed 95% of the incident.
+
+Oddly, the car started without problems the next morning. Curse indeed.
+
+[[tag lay]]

diff --git a/blog/entry/electic_bike.mdwn b/blog/entry/electic_bike.mdwn
new file mode 100644
index 0000000..f0f09db
--- /dev/null
+++ b/blog/entry/electic_bike.mdwn
@@ -0,0 +1,57 @@
+I decided to get an electic bike when my [[car_died|vacation]]. Couldn't
+quite stomach buying a new gasoline vehicle at this point in time, didn't
+really feel like another used car, and the available electic cars are still
+too new/expensive/hard to find. While there are some neat NEVs that are not
+too expensive, they're too limited to be worth my money, and electic bikes
+fit into the same general niche. (So do electic scooters, but I didn't want
+to spend that much money on an experiment..)
+
+My first try was a disaster. I was thinking that a large cargo capacity
+would be a good thing, so I gravitated toward trikes. However, the one I
+tried turned out to be a lemon in several ways, and suffered a catastropic
+and dangerous controller burnout. So I learned that this electic bike
+industry is pretty rough and ready with a lot of junk to avoid. I also
+learned that I don't enjoy riding trikes.
+
+The second try was a [R Martin LX1](http://www.rmartinbikes.com/LX1-electric-bicycle.html), which my dad
+had researched. I got it yesterday, and have ridden it some now, and I
+agree that it's a good one.
+
+As a bike, it's well built, has a good back disc brake and decent front
+brake (will be better once I bring it to a bike shop to adjust it better),
+has a good derailer, and rides well. I'm no expert but it seems about as
+good as the bike I used to commute with, though the frame is a bit heavier.
+(IIRC, it was also at least $200 *cheaper* than that bike!)
+
+On the electic side, it has a relatively small and light lithium ion
+battery; the motor is mounted in the hub. It's strong enough to go up hills
+on its own if you really want it to, but you will end up pedaling to
+assist, which is good.
+
+I'm undecided whether the six gears are enough ... Seems like I might want a
+faster gear, to be able to assist the motor more at high speed. I haven't
+wanted a lower gear yet, but I've not tried to do any hills without the
+motor's help.
+
+The electic controls are ok, but not perfect. I worry about accidentially
+twisting the throttle, although it has to be turned quite far to engage the
+motor.
+
+Ideally, the pedal assist would turn the motor on exactly when you pedal,
+and porportionally to how hard. Instead, there'a a lag, and doesn't care
+how hard you pedal. This can present problems coming up to an intersection
+or other hazard, where pedal assist kicking in can unexpectedly be more
+speed than is needed. Seems a waste to have to brake to cut the assist off.
+
+The motor is audible when accellerating, and especially complains when
+trying to get me up a hill on its own. At speed, or if given a human power
+assist, it's quieter than the chain, if not silent.
+
+So there's room for improvement (and this would be a fun thing to do some
+hacking on to improve its response), but it's still a lot of fun. I'd
+forgotten how much I enjoy riding a bike and getting a nice workout. And
+it's especially nice to go up a hill pedaling only as hard as you like, to
+be able to accellerate quickly without standing on the pedals, and to be
+able to "coast" a long, long, way.
+
+[[!tag lay bike review]]

diff --git a/code/debian.mdwn b/code/debian.mdwn
index 79838c0..c36d5cb 100644
--- a/code/debian.mdwn
+++ b/code/debian.mdwn
@@ -1,8 +1,15 @@
-Debian is too large for this page, and my decade-plus of involvement in the Debian project, and my thoughts and plans for it are too large to really describe here. 
+Debian is too large for this page, and my decade-plus of involvement in the
+Debian project, and my thoughts and plans for it are too large to really
+describe here. 
 
 <http://www.debian.org/>
 
-Suffice to say that while many of the other projects listed here ([[debian-installer]], [[debhelper]], [[debconf]], [[devscripts]], [[dpkg-repack]], probably anything starting with the letter "d") are subprojects _of_ Debian, and while nearly anything else on the whole wiki is probably available _in_ Debian, all that is just a fraction of all the work I've done _for_ Debian.
+Suffice to say that while many of the other projects listed here
+([[debian-installer]], [[debhelper]], [[debconf]], [[devscripts]],
+[[dpkg-repack]], probably anything starting with the letter "d") are
+subprojects _of_ Debian, and while nearly anything else on the whole wiki
+is probably available _in_ Debian, all that is just a fraction of all the
+work I've done _for_ Debian.
 
 ## Some of Joey's random plans for Debian[1][2]
 

diff --git a/code/sleepd/news/version_1.12.mdwn b/code/sleepd/news/version_1.12.mdwn
new file mode 100644
index 0000000..aae7fd9
--- /dev/null
+++ b/code/sleepd/news/version_1.12.mdwn
@@ -0,0 +1,5 @@
+sleepd 1.12 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Write status back out to control file when resume from manual sleep causes
+     sleeping to be re-enabled, so that sleepctl will see the correct status
+     in this case. Closes: #[501708](http://bugs.debian.org/501708)"""]]
\ No newline at end of file
diff --git a/code/sleepd/news/version_1.7.mdwn b/code/sleepd/news/version_1.7.mdwn
deleted file mode 100644
index 070d8c8..0000000
--- a/code/sleepd/news/version_1.7.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-sleepd 1.7 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Magic header file reordering to work around the disgusting
-     linux-libc-dev/libc headers conflicts (#435700). Closes: #[468070](http://bugs.debian.org/468070)"""]]
\ No newline at end of file

diff --git a/blog/entry/the_case_of_the_missing___39__s__39__.mdwn b/blog/entry/the_case_of_the_missing___39__s__39__.mdwn
new file mode 100644
index 0000000..44b9f96
--- /dev/null
+++ b/blog/entry/the_case_of_the_missing___39__s__39__.mdwn
@@ -0,0 +1,8 @@
+Ran into a freakish epiphany/gmail bug yesterday where gmails's "new"
+interface somehow ate the 's' key, preventing it from working in epiphany
+at all. Even after logging out of gmail.
+
+If any readers of this blog have contacts inside the gmail team, I've filed
+[[debbug 501691]] on epiphany with details about this scary situation.
+
+Personally, a web that can eat 's' keys is not the web I want.

diff --git a/blog/entry/feature_creep.mdwn b/blog/entry/feature_creep.mdwn
index 89cbd1e..7ff38a2 100644
--- a/blog/entry/feature_creep.mdwn
+++ b/blog/entry/feature_creep.mdwn
@@ -6,8 +6,6 @@ times. Ok, let's add in getting a load of gravel to fix that. Hmm, if we're
 going to get one load of gravel (over one ton already!), might as well
 [get two](http://waldeneffect.org/blog/Digging_potatoes__44___hauling_gravel/)...
 
-<img src="http://www.waldeneffect.org/kingofthegravel2.JPG" alt="gravel pile">
-
 Hmm, we didn't notice that unloading tons of gravel, for three people with
 shovels, is 95% of the planned work for today. Oh well, let's do it
 anyway...

diff --git a/blog/entry/feature_creep.mdwn b/blog/entry/feature_creep.mdwn
index 26e9d26..89cbd1e 100644
--- a/blog/entry/feature_creep.mdwn
+++ b/blog/entry/feature_creep.mdwn
@@ -3,8 +3,10 @@ Use case: Joey is in [[yurt]]. Joey has power, and even interwebs.
 
 But this means parking the truck in the area where it got stuck the last two
 times. Ok, let's add in getting a load of gravel to fix that. Hmm, if we're
-going to get one load of gravel (over one ton already!), might as well get
-two...
+going to get one load of gravel (over one ton already!), might as well
+[get two](http://waldeneffect.org/blog/Digging_potatoes__44___hauling_gravel/)...
+
+<img src="http://www.waldeneffect.org/kingofthegravel2.JPG" alt="gravel pile">
 
 Hmm, we didn't notice that unloading tons of gravel, for three people with
 shovels, is 95% of the planned work for today. Oh well, let's do it

diff --git a/blog/entry/feature_creep.mdwn b/blog/entry/feature_creep.mdwn
index 35bfef1..26e9d26 100644
--- a/blog/entry/feature_creep.mdwn
+++ b/blog/entry/feature_creep.mdwn
@@ -11,8 +11,8 @@ shovels, is 95% of the planned work for today. Oh well, let's do it
 anyway...
 
 Darn, that super-long ethernet cable that was part of the original plan
-doesn't work. No link at all, no lights on the cable tester. At least the
-power cable worked. I guess that ethernet will have to be dealt with in
-version 2.0..
+doesn't work. No link at all, no lights on the cable tester. (Bisection
+shows the problem affects only half the cable.) At least the power cable
+worked. I guess that ethernet will have to be dealt with in version 2.0..
 
 [[tag lay code]]

diff --git a/blog/code.mdwn b/blog/code.mdwn
index 54541be..e6fa4fa 100644
--- a/blog/code.mdwn
+++ b/blog/code.mdwn
@@ -1,5 +1,5 @@
 This feed contains some of my blog entries that link to software [[/code]] that
 I've developed.
 
-[[inline pages="blog/entry/* and link(code/*) and !*/Discussion"
-actions=yes show="10"]]
+[[inline pages="blog/entry/* and (link(code/*) or link(code))
+and !*/Discussion" actions=yes show="10"]]
diff --git a/blog/entry/feature_creep.mdwn b/blog/entry/feature_creep.mdwn
new file mode 100644
index 0000000..35bfef1
--- /dev/null
+++ b/blog/entry/feature_creep.mdwn
@@ -0,0 +1,18 @@
+The original spec for today: Go out to Anna's. Run some cables.  
+Use case: Joey is in [[yurt]]. Joey has power, and even interwebs.  
+
+But this means parking the truck in the area where it got stuck the last two
+times. Ok, let's add in getting a load of gravel to fix that. Hmm, if we're
+going to get one load of gravel (over one ton already!), might as well get
+two...
+
+Hmm, we didn't notice that unloading tons of gravel, for three people with
+shovels, is 95% of the planned work for today. Oh well, let's do it
+anyway...
+
+Darn, that super-long ethernet cable that was part of the original plan
+doesn't work. No link at all, no lights on the cable tester. At least the
+power cable worked. I guess that ethernet will have to be dealt with in
+version 2.0..
+
+[[tag lay code]]

diff --git a/blog/entry/another_first/discussion.mdwn b/blog/entry/another_first/discussion.mdwn
index 4035f78..80b37cf 100644
--- a/blog/entry/another_first/discussion.mdwn
+++ b/blog/entry/another_first/discussion.mdwn
@@ -3,3 +3,5 @@ The standard says you are almost 40 foots away (If I remember well, they were 11
     IIRC the mathematics involved give a maximum cable length of ~136 meters (~445ft) based on ethernet timeouts vs propagation time.
     Should be interesting to see if it works in practice...
     -owen
+
+Owen, perhaps I'll get lucky then, I'm under 445 feet. I figured there was some give in the 100 meter limit that's quoted everwhere. Was thinking about signal attenuation, but propigation time is a harder limit. --[[Joey]]

diff --git a/blog/entry/happy_happy_joy_joy/discussion.mdwn b/blog/entry/happy_happy_joy_joy/discussion.mdwn
new file mode 100644
index 0000000..7a2bcb5
--- /dev/null
+++ b/blog/entry/happy_happy_joy_joy/discussion.mdwn
@@ -0,0 +1,8 @@
+Umh... Well, I'm currently still using Awesome 2.3.4 - And I _do_ have good system tray support.
+
+From my <tt>.xsession</tt>:
+
+    /usr/bin/trayer --edge bottom --align right --expand true --widthtype request \
+        --height 20 --tint 0x000077 --transparent true --SetDockType true &
+
+Of course, it fits quite nicely in the least used portion of my <tt>bottom</tt> statusbar.

diff --git a/blog/entry/another_first/discussion.mdwn b/blog/entry/another_first/discussion.mdwn
index 3ec50de..4035f78 100644
--- a/blog/entry/another_first/discussion.mdwn
+++ b/blog/entry/another_first/discussion.mdwn
@@ -1 +1,5 @@
 The standard says you are almost 40 foots away (If I remember well, they were 110 meters maximum from jack to jack) 
+
+    IIRC the mathematics involved give a maximum cable length of ~136 meters (~445ft) based on ethernet timeouts vs propagation time.
+    Should be interesting to see if it works in practice...
+    -owen

diff --git a/blog/entry/another_first/discussion.mdwn b/blog/entry/another_first/discussion.mdwn
new file mode 100644
index 0000000..3ec50de
--- /dev/null
+++ b/blog/entry/another_first/discussion.mdwn
@@ -0,0 +1 @@
+The standard says you are almost 40 foots away (If I remember well, they were 110 meters maximum from jack to jack) 

diff --git a/blog/entry/another_first.mdwn b/blog/entry/another_first.mdwn
new file mode 100644
index 0000000..b63b353
--- /dev/null
+++ b/blog/entry/another_first.mdwn
@@ -0,0 +1,6 @@
+Just to make it a day of firsts, and perhaps because someone else spent
+four hours messing with wire and such in my mouth and I needed to take some
+control back, I also crimped my first ethernet cable today.
+
+Plan is to see if a 400 foot out of spec cable will reach the yurt. If not,
+I'll cut it 100 feet back and add a hub in a can to be a repeater.

diff --git a/blog/entry/happy_happy_joy_joy.mdwn b/blog/entry/happy_happy_joy_joy.mdwn
new file mode 100644
index 0000000..ba7e6ba
--- /dev/null
+++ b/blog/entry/happy_happy_joy_joy.mdwn
@@ -0,0 +1,11 @@
+First root canal today. There were some interesting parts. I'll spare you.
+
+If I seemed a bit annoyed with awesome 3 configuration in the last post,
+this has put it well in perspective.
+
+One nice thing about awesome 3 is that it has good system tray support
+built in. So I've at least temporarily mainstreamed my laptop, so it's
+using the gnome power manager, and network manager, instead of hibernate
+and sleepd and my own scripts.
+
+[[tag lay]]

diff --git a/blog/entry/awesomely_frustrated/discussion.mdwn b/blog/entry/awesomely_frustrated/discussion.mdwn
index adaf157..416b654 100644
--- a/blog/entry/awesomely_frustrated/discussion.mdwn
+++ b/blog/entry/awesomely_frustrated/discussion.mdwn
@@ -3,3 +3,7 @@ I certainly hated lua with ion, but I haven't invested the time to learn awesome
 ---
 
 Add to the list: Can't figure out how to duplicate tag 0 functionality.  sigh.
+
+---
+
+The awesome mailing list is a great place to bring stuff like this up. It's a pretty young project still. Julien is pretty open to adding new features if they are good ones...