diff --git a/blog/entry/announcing_etckeeper/discussion.mdwn b/blog/entry/announcing_etckeeper/discussion.mdwn
index 3ac7a74..f9ab8da 100644
--- a/blog/entry/announcing_etckeeper/discussion.mdwn
+++ b/blog/entry/announcing_etckeeper/discussion.mdwn
@@ -10,3 +10,5 @@ getopenid.com/tekknokrat
 ---
 
 This is great. At the moment I'm trying to figure out a solution though that includes the ability to push to a central server. This should be simple enough by editing .git/config . What would be really cool though is if admins login with their normal username, then sudo add/commit/push which uses their local ~/.gitconfig and ssh keys. That way you could easily track who has made what edits without having to remember to put it into comments. I notice http://bryan-murdock.blogspot.com/2007/07/put-etc-under-revision-control-with-git.html uses a $caller environment variable, but it would be really smart if it actually set the author correctly in the git repository. Any ideas how to do this?
+
+It would seem that you can achieve this by starting ssh-agent, then running ssh-add. Then when running sudo git push will use the real users identity :D

diff --git a/blog/entry/announcing_etckeeper/discussion.mdwn b/blog/entry/announcing_etckeeper/discussion.mdwn
index 46be2f3..3ac7a74 100644
--- a/blog/entry/announcing_etckeeper/discussion.mdwn
+++ b/blog/entry/announcing_etckeeper/discussion.mdwn
@@ -5,4 +5,8 @@ This is great. I've been thinking along those lines, of keeping separate branche
 I am looking for this a long time ago, but would like to see it with a svnstore. 
 Would you mind to discuss here why svn do "suck" apart of the central-repo-only (dis)ability?
 
-getopenid.com/tekknokrat
\ No newline at end of file
+getopenid.com/tekknokrat
+
+---
+
+This is great. At the moment I'm trying to figure out a solution though that includes the ability to push to a central server. This should be simple enough by editing .git/config . What would be really cool though is if admins login with their normal username, then sudo add/commit/push which uses their local ~/.gitconfig and ssh keys. That way you could easily track who has made what edits without having to remember to put it into comments. I notice http://bryan-murdock.blogspot.com/2007/07/put-etc-under-revision-control-with-git.html uses a $caller environment variable, but it would be really smart if it actually set the author correctly in the git repository. Any ideas how to do this?

diff --git a/blog/entry/vacation.mdwn b/blog/entry/vacation.mdwn
index a1d42bf..5e5afd9 100644
--- a/blog/entry/vacation.mdwn
+++ b/blog/entry/vacation.mdwn
@@ -9,7 +9,7 @@ which is not normally open to the public and has what is supposed to be the only
 fen in the southern Appalachians.
 
 <a href="http://kitenet.net/~family/pics/summer2008/100_0836.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0836.JPG" alt="photo" width="300" height="225" /></a>
-<a href="http://kitenet.net/~family/pics/summer2008/100_0862.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0862.JPG" alt="photo" width="300" height="225" /></a> <a href="./summer2008/100_0831.JPG">
+<a href="http://kitenet.net/~family/pics/summer2008/100_0862.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0862.JPG" alt="photo" width="300" height="225" /></a>
 <img src="http://www.nature.org/wherewework/northamerica/states/northcarolina/images/nc3a.jpg">
 
 Also, I no longer have a car after that trip. I am, however, looking at various

diff --git a/blog/entry/vacation.mdwn b/blog/entry/vacation.mdwn
index b4a09fe..a1d42bf 100644
--- a/blog/entry/vacation.mdwn
+++ b/blog/entry/vacation.mdwn
@@ -9,9 +9,7 @@ which is not normally open to the public and has what is supposed to be the only
 fen in the southern Appalachians.
 
 <a href="http://kitenet.net/~family/pics/summer2008/100_0836.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0836.JPG" alt="photo" width="300" height="225" /></a>
-
 <a href="http://kitenet.net/~family/pics/summer2008/100_0862.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0862.JPG" alt="photo" width="300" height="225" /></a> <a href="./summer2008/100_0831.JPG">
-
 <img src="http://www.nature.org/wherewework/northamerica/states/northcarolina/images/nc3a.jpg">
 
 Also, I no longer have a car after that trip. I am, however, looking at various

diff --git a/blog/entry/vacation.mdwn b/blog/entry/vacation.mdwn
new file mode 100644
index 0000000..b4a09fe
--- /dev/null
+++ b/blog/entry/vacation.mdwn
@@ -0,0 +1,23 @@
+This "beach trip" was unusual, as its [[ocracode]] shows:
+
+OBX1.1 P5/6/4 L6 S12+b----c---- U10(mountains,freshwater,etc) T0 f0 b0 Rd 
+Bb----m----n---- F+ SC----s--g0 H----f0i0.5 V+++s--m0 E-r--
+
+Here are 4 generations of Hess's on a visit to the 
+[Bluff Mountain Preserve](http://www.nature.org/wherewework/northamerica/states/northcarolina/preserves/art5590.html),
+which is not normally open to the public and has what is supposed to be the only
+fen in the southern Appalachians.
+
+<a href="http://kitenet.net/~family/pics/summer2008/100_0836.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0836.JPG" alt="photo" width="300" height="225" /></a>
+
+<a href="http://kitenet.net/~family/pics/summer2008/100_0862.JPG"><img src="http://kitenet.net/~family/pics/summer2008/300x300-100_0862.JPG" alt="photo" width="300" height="225" /></a> <a href="./summer2008/100_0831.JPG">
+
+<img src="http://www.nature.org/wherewework/northamerica/states/northcarolina/images/nc3a.jpg">
+
+Also, I no longer have a car after that trip. I am, however, looking at various
+electric bicycles. As someone who hates being posessed by posessions, I'm happy
+that losing my car doesn't really bother me.
+
+Oh, and Leo has kitty-laryngitis.
+
+[[tag lay]]

diff --git a/code/debhelper/news/version_7.0.12.mdwn b/code/debhelper/news/version_7.0.12.mdwn
deleted file mode 100644
index e6080d8..0000000
--- a/code/debhelper/news/version_7.0.12.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-debhelper 7.0.12 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * Correct docs about dh\_install and debian/tmp in v7 mode. It first looks in
-     the current directory, or whatever is configured with --srcdir. Then it
-     always falls back to looking in debian/tmp.
-   * Medium urgency to get this doc fix into testing."""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.17.mdwn b/code/debhelper/news/version_7.0.17.mdwn
new file mode 100644
index 0000000..eda79ee
--- /dev/null
+++ b/code/debhelper/news/version_7.0.17.mdwn
@@ -0,0 +1,9 @@
+debhelper 7.0.17 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+ * [ Per Olofsson ]
+   * dh\_auto\_install: Fix man page, was referring to dh\_auto\_clean.
+ * [ Joey Hess ]
+   * dh\_gencontrol: Drop the Homepage field from udebs. Closes: #[492719](http://bugs.debian.org/492719)
+   * Typo. Closes: #[493062](http://bugs.debian.org/493062)
+   * dh\_auto\_install: Improve check for MakeMaker, to avoid passing PREFIX
+     if the Makefile was generated by Module::Build::Compat. Closes: #[496157](http://bugs.debian.org/496157)"""]]
\ No newline at end of file
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 1cbadd0..236963b 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,3 +2,17 @@ Testing 1 2 3!!
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]
+
+\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}"]]
+
+[[!teximg code="\frac{1}{2}"]]
+
+[[!teximg code="E = - \frac{Z^2 \cdot  \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]]
+
+[[!teximg code="E = - \frac{Z^2 \cdot  \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" height=20 ]]
+
+\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="20"]]
+
+\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="17"]]
+
+\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="8"]]

diff --git a/blog/entry/cdbs_killer___40__design_phase__41__.mdwn b/blog/entry/cdbs_killer___40__design_phase__41__.mdwn
index cfdd6c6..f25881a 100644
--- a/blog/entry/cdbs_killer___40__design_phase__41__.mdwn
+++ b/blog/entry/cdbs_killer___40__design_phase__41__.mdwn
@@ -24,7 +24,7 @@ modification:
 
 	#!/usr/bin/make -f
 	%:
-		dh %@
+		dh $@
 
 ## the complex cases
 

diff --git a/blog/entry/cutting_back/discussion.mdwn b/blog/entry/cutting_back/discussion.mdwn
index af17f06..610d954 100644
--- a/blog/entry/cutting_back/discussion.mdwn
+++ b/blog/entry/cutting_back/discussion.mdwn
@@ -1,2 +1,7 @@
-Those of us not well versed in very latest of Debian behind the scenes (but otherwise big fans of your software {etckeeper, ikiwiki to name a few} ) wonder why such a turn of events.
+Those of us not well versed in very latest of Debian behind the scenes (but
+otherwise big fans of your software {etckeeper, ikiwiki to name a few} )
+wonder why such a turn of events.
 
+> Suffice to say that there's no specific issue going on behind the scenes
+> (or out in the open for that matter) in Debian that led to this decision.
+> --[[Joey]]

diff --git a/blog/entry/cutting_back/discussion.mdwn b/blog/entry/cutting_back/discussion.mdwn
new file mode 100644
index 0000000..af17f06
--- /dev/null
+++ b/blog/entry/cutting_back/discussion.mdwn
@@ -0,0 +1,2 @@
+Those of us not well versed in very latest of Debian behind the scenes (but otherwise big fans of your software {etckeeper, ikiwiki to name a few} ) wonder why such a turn of events.
+

diff --git a/blog/entry/cutting_back.mdwn b/blog/entry/cutting_back.mdwn
new file mode 100644
index 0000000..cd1c38f
--- /dev/null
+++ b/blog/entry/cutting_back.mdwn
@@ -0,0 +1,6 @@
+I'm going to cut down on debian-related stuff further. At least until next
+DebConf, I plan to reduce my involvement in the project to a minimum.
+
+So, I'm unsubscribing from all (52!) lists now, except debian-devel-announce.
+Feel free to mail me privatly if you want to ask about anything. I'll still
+see bug reports.

diff --git a/blog/entry/awesome_tags/discussion.mdwn b/blog/entry/awesome_tags/discussion.mdwn
new file mode 100644
index 0000000..18df62f
--- /dev/null
+++ b/blog/entry/awesome_tags/discussion.mdwn
@@ -0,0 +1 @@
+Tag 0 is magic.  Try it...

diff --git a/blog/entry/debconf_day_5.mdwn b/blog/entry/debconf_day_5.mdwn
new file mode 100644
index 0000000..726609d
--- /dev/null
+++ b/blog/entry/debconf_day_5.mdwn
@@ -0,0 +1,17 @@
+Missed the morning talks.. looking forward to replays being available..
+
+#### rails
+
+Projects not bothering to release tarballs, and just publishing a git repo
+(hopefully with some tags!) will only become more common, I think, and it's
+interesting to see this is already very common with ruby gems.
+
+Faking up an orig tarball is still a reasonable workaround now, but will
+probably look very retro in 5 years.
+
+Re Debian vs Rails communities, I wonder if there's a generation gap in here
+somewhere..
+
+#### rest
+
+(will update throughout the day)

diff --git a/code/sleepd/news/version_1.11.mdwn b/code/sleepd/news/version_1.11.mdwn
new file mode 100644
index 0000000..eb1e921
--- /dev/null
+++ b/code/sleepd/news/version_1.11.mdwn
@@ -0,0 +1,7 @@
+sleepd 1.11 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Tweak acpi/hal backend chosing logic to deal with being started before
+     hal on a system without acpi power info. Closes: #[494912](http://bugs.debian.org/494912)
+   * Make init script depend on hal and move init script sequence number to
+     after hal for new installs. Both changes avoid warning message in syslog,
+     but the change above makes it ok if old installs don't follow suite."""]]
\ No newline at end of file
diff --git a/code/sleepd/news/version_1.6.mdwn b/code/sleepd/news/version_1.6.mdwn
deleted file mode 100644
index ca92e68..0000000
--- a/code/sleepd/news/version_1.6.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-sleepd 1.6 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * Use hibernate as the default sleep command when using hal, same as for
-     raw acpi.
-   * Make init script depend on dbus, to avoid sleepd getting confused
-     if dbus is stopped."""]]
\ No newline at end of file

diff --git a/blog/entry/DebConf_day_2/discussion.mdwn b/blog/entry/DebConf_day_2/discussion.mdwn
index 321e2d2..cb02c8e 100644
--- a/blog/entry/DebConf_day_2/discussion.mdwn
+++ b/blog/entry/DebConf_day_2/discussion.mdwn
@@ -3,3 +3,5 @@
 I think this is true only in that many of your packages are incorrectly packaged as Debian-native. Just because you're upstream for the package doesn't mean it should be a Debian-native package. Packages like 'ikiwiki', 'mr', and 'ticker' are hardly Debian-specific. Packages with a clear usefulness outside the context of a Debian system should be non-native, with Debian packaging separated from the source tarball; this makes your source useful for other distributions, who can then easily apply their own 'debian/' directory if they choose.
 
 Do you have a good argument for keeping non-Debian-specific packages as Debian-native?
+
+—Ben Finney

diff --git a/blog/entry/DebConf_day_2/discussion.mdwn b/blog/entry/DebConf_day_2/discussion.mdwn
new file mode 100644
index 0000000..321e2d2
--- /dev/null
+++ b/blog/entry/DebConf_day_2/discussion.mdwn
@@ -0,0 +1,5 @@
+> stopped maintaining any non-native packages
+
+I think this is true only in that many of your packages are incorrectly packaged as Debian-native. Just because you're upstream for the package doesn't mean it should be a Debian-native package. Packages like 'ikiwiki', 'mr', and 'ticker' are hardly Debian-specific. Packages with a clear usefulness outside the context of a Debian system should be non-native, with Debian packaging separated from the source tarball; this makes your source useful for other distributions, who can then easily apply their own 'debian/' directory if they choose.
+
+Do you have a good argument for keeping non-Debian-specific packages as Debian-native?

diff --git a/blog/entry/awesome_tags.mdwn b/blog/entry/awesome_tags.mdwn
index f9b6bc7..6b1b9e8 100644
--- a/blog/entry/awesome_tags.mdwn
+++ b/blog/entry/awesome_tags.mdwn
@@ -13,9 +13,9 @@ to display tags 9+3 at the same time. And after I've done this, can
 mod+left/right to go up and down between tags, and tag 9 stays selected
 and visible. Awesome automatically lays everything out.
 
-[[img 3+9.jpg]]
-[[img 2+9.jpg]]
-[[img 5+9.jpg]]
+[[img 3+9.jpg]]  
+[[img 2+9.jpg]]  
+[[img 5+9.jpg]]  
 
 Only thing I don't like is that if I use mod+N to switch to a specific
 tag, it will drop tag 9.

diff --git a/blog/entry/awesome_tags.mdwn b/blog/entry/awesome_tags.mdwn
index bb28025..f9b6bc7 100644
--- a/blog/entry/awesome_tags.mdwn
+++ b/blog/entry/awesome_tags.mdwn
@@ -13,7 +13,9 @@ to display tags 9+3 at the same time. And after I've done this, can
 mod+left/right to go up and down between tags, and tag 9 stays selected
 and visible. Awesome automatically lays everything out.
 
-[[img 3+9.jpg]] [[img 2+9.jpg]] [[img 5+9.jpg]]
+[[img 3+9.jpg]]
+[[img 2+9.jpg]]
+[[img 5+9.jpg]]
 
 Only thing I don't like is that if I use mod+N to switch to a specific
 tag, it will drop tag 9.

diff --git a/blog/entry/awesome_tags.mdwn b/blog/entry/awesome_tags.mdwn
index 69ba75a..bb28025 100644
--- a/blog/entry/awesome_tags.mdwn
+++ b/blog/entry/awesome_tags.mdwn
@@ -5,7 +5,6 @@ I'm attending debconf via irc and web stream, and have that on tag 9.
 Which I mostly think of a a desktop, since I generally view one tag
 at a time, and flip between them like desktops.
 
-[[img default size="256x256"]]
 [[img 9.jpg]]
 
 But often I want to browse the web, or do something else too, without

diff --git a/blog/entry/DebConf_day_2.mdwn b/blog/entry/DebConf_day_2.mdwn
index fc82033..ef69ee9 100644
--- a/blog/entry/DebConf_day_2.mdwn
+++ b/blog/entry/DebConf_day_2.mdwn
@@ -32,6 +32,7 @@ Looking forward to the remote controlled telepresence robots at debconf 10!
 
 (Also to a lack of tango loop music.)
 
-### rest
+### bugs in large packages
 
-Will be updated with rest of talks as I attend.
+Bug summaries are not yet shown in the "extra information" in the bug
+index page.
diff --git a/blog/entry/awesome_tags.mdwn b/blog/entry/awesome_tags.mdwn
new file mode 100644
index 0000000..69ba75a
--- /dev/null
+++ b/blog/entry/awesome_tags.mdwn
@@ -0,0 +1,20 @@
+Today I figured out why the awesome window manager's tags are so eh,
+awesome.
+
+I'm attending debconf via irc and web stream, and have that on tag 9.
+Which I mostly think of a a desktop, since I generally view one tag
+at a time, and flip between them like desktops.
+
+[[img default size="256x256"]]
+[[img 9.jpg]]
+
+But often I want to browse the web, or do something else too, without
+losing the video and irc offscreen. So from tag 9, I can press mod+ctrl+3
+to display tags 9+3 at the same time. And after I've done this, can
+mod+left/right to go up and down between tags, and tag 9 stays selected
+and visible. Awesome automatically lays everything out.
+
+[[img 3+9.jpg]] [[img 2+9.jpg]] [[img 5+9.jpg]]
+
+Only thing I don't like is that if I use mod+N to switch to a specific
+tag, it will drop tag 9.
diff --git a/blog/entry/awesome_tags/2+9.jpg b/blog/entry/awesome_tags/2+9.jpg
new file mode 100644
index 0000000..fc71570
Binary files /dev/null and b/blog/entry/awesome_tags/2+9.jpg differ
diff --git a/blog/entry/awesome_tags/3+9.jpg b/blog/entry/awesome_tags/3+9.jpg
new file mode 100644
index 0000000..1bf6a3d
Binary files /dev/null and b/blog/entry/awesome_tags/3+9.jpg differ
diff --git a/blog/entry/awesome_tags/4+9.jpg b/blog/entry/awesome_tags/4+9.jpg
new file mode 100644
index 0000000..028008c
Binary files /dev/null and b/blog/entry/awesome_tags/4+9.jpg differ
diff --git a/blog/entry/awesome_tags/5+9.jpg b/blog/entry/awesome_tags/5+9.jpg
new file mode 100644
index 0000000..ef04f0b
Binary files /dev/null and b/blog/entry/awesome_tags/5+9.jpg differ
diff --git a/blog/entry/awesome_tags/9.jpg b/blog/entry/awesome_tags/9.jpg
new file mode 100644
index 0000000..afba800
Binary files /dev/null and b/blog/entry/awesome_tags/9.jpg differ

diff --git a/blog/entry/DebConf_day_2.mdwn b/blog/entry/DebConf_day_2.mdwn
index a771a1e..fc82033 100644
--- a/blog/entry/DebConf_day_2.mdwn
+++ b/blog/entry/DebConf_day_2.mdwn
@@ -24,6 +24,14 @@ stopped maintaining any non-native packages; your loss.
 Topgit looks generally handy, and it was neat to have its author on irc
 during the talk.
 
+### video team
+
+Hundreds of remote watchers -- impressive..
+
+Looking forward to the remote controlled telepresence robots at debconf 10!
+
+(Also to a lack of tango loop music.)
+
 ### rest
 
 Will be updated with rest of talks as I attend.

diff --git a/blog/entry/DebConf_day_2.mdwn b/blog/entry/DebConf_day_2.mdwn
index 3116f8c..a771a1e 100644
--- a/blog/entry/DebConf_day_2.mdwn
+++ b/blog/entry/DebConf_day_2.mdwn
@@ -21,6 +21,9 @@ I won't bother once again repeating my responses to tired arguments like
 "git's archive format will change!" Been there, done that, been ignored;
 stopped maintaining any non-native packages; your loss.
 
+Topgit looks generally handy, and it was neat to have its author on irc
+during the talk.
+
 ### rest
 
 Will be updated with rest of talks as I attend.

diff --git a/blog/entry/DebConf_day_2.mdwn b/blog/entry/DebConf_day_2.mdwn
index 6de5c44..3116f8c 100644
--- a/blog/entry/DebConf_day_2.mdwn
+++ b/blog/entry/DebConf_day_2.mdwn
@@ -1,6 +1,6 @@
 More notes and reactions from DebConf video.
 
-### debbugs / soap
+### debbugs
 
 Hadn't realised how handy `bts select` is!
 
@@ -15,6 +15,12 @@ Local partial debbugs mirror: Crazy idea, but better than `bts cache`. :-)
 (And if it provides an incentive for a current and proper debbugs deb to
 be maintained, that's a win.)
 
+### vcs-pkg
+
+I won't bother once again repeating my responses to tired arguments like
+"git's archive format will change!" Been there, done that, been ignored;
+stopped maintaining any non-native packages; your loss.
+
 ### rest
 
 Will be updated with rest of talks as I attend.

diff --git a/blog/entry/DebConf_day_2.mdwn b/blog/entry/DebConf_day_2.mdwn
new file mode 100644
index 0000000..6de5c44
--- /dev/null
+++ b/blog/entry/DebConf_day_2.mdwn
@@ -0,0 +1,20 @@
+More notes and reactions from DebConf video.
+
+### debbugs / soap
+
+Hadn't realised how handy `bts select` is!
+
+My `CVE-XXX-XXXX` tags are a fairly large percentage of the 3000+ unique
+user tags. 2461 to be exact. :-) It would be nice to be able to view a list
+of all users of usertags, and their tags, in the BTS web interface.
+
+Yay! Don implemented the summary idea already.  
+(And I implemented `bts summary` during his talk.)
+
+Local partial debbugs mirror: Crazy idea, but better than `bts cache`. :-)
+(And if it provides an incentive for a current and proper debbugs deb to
+be maintained, that's a win.)
+
+### rest
+
+Will be updated with rest of talks as I attend.

diff --git a/blog/entry/All_Seated_on_the_Ground.mdwn b/blog/entry/All_Seated_on_the_Ground.mdwn
new file mode 100644
index 0000000..481ec44
--- /dev/null
+++ b/blog/entry/All_Seated_on_the_Ground.mdwn
@@ -0,0 +1,42 @@
+A few notes/reactions from the talks I attended today from the very, very
+back of the room. (AKA the skivvies and/or backyard track.)
+
+([titular story](http://www.asimovs.com/_issue_0805/allseated.shtml) by
+Connie Willis)
+
+### DPL talk
+
+FYI, I raised my hand when Sledge asked for a show of hands. :`-(
+
+### MANCOOSI
+
+(Is aptitude's dependency resolver deterministic?)
+
+### wiki
+
+I doubt that trying to get the whole wiki licensed under a specific license
+is a good use of time. Since the wiki is not a package that we ship, but
+is instead a ad-hoc collection of many documents, and many conversations, I
+also don't see the point of a single consistent license, or any reason to
+be bothered by content whose license is not specified.
+
+Be very wary of anything that makes contributing to the wiki require
+jumping through more legal hoops than it takes to contribute to
+lists.debian.org or bugs.debian.org. 
+[Chilling effects](http://www.chillingeffects.org/) can work both ways.
+
+### method diffusion in free software projects
+
+Most interesting talk today. Was hoping for some results, but not
+disappointed. (Yak shaving!)
+
+### user and NM surveys
+
+Looked like most DDs in the audience hadn't heard of the survey?
+
+### SPI
+
+Nice numbers and more big projects than I'd thought.
+
+Avoided being locked in room, so still not a SPI member. ;-)
+

diff --git a/blog/entry/arrived_at_debconf.mdwn b/blog/entry/arrived_at_debconf.mdwn
new file mode 100644
index 0000000..3deb307
--- /dev/null
+++ b/blog/entry/arrived_at_debconf.mdwn
@@ -0,0 +1,5 @@
+Well, close as I'll get this year.
+
+[[img pics/debconf-screenshot.png size="256x256"]]
+
+Making the most of it, [thanks to the video team](http://wiki.debconf.org/wiki/DebConf8/Streams).
diff --git a/blog/pics/debconf-screenshot.png b/blog/pics/debconf-screenshot.png
new file mode 100644
index 0000000..8ddac54
Binary files /dev/null and b/blog/pics/debconf-screenshot.png differ

diff --git a/blog/entry/life__44___day_11801.mdwn b/blog/entry/life__44___day_11801.mdwn
index d1b5f0e..f242295 100644
--- a/blog/entry/life__44___day_11801.mdwn
+++ b/blog/entry/life__44___day_11801.mdwn
@@ -13,3 +13,5 @@ combusion, please shoot me.)
 Another night on battery power @yurt.
 
 Now playing: Cicadas and The Who, loudly.
+
+[[tag lay]]

diff --git a/blog/entry/august.mdwn b/blog/entry/august.mdwn
new file mode 100644
index 0000000..74d2642
--- /dev/null
+++ b/blog/entry/august.mdwn
@@ -0,0 +1,10 @@
+I've been fearing August for months. That [[miserable|heat2]] hot streak in
+early June pumped it up to absolute dread. Not being able to escape to winter in
+Argentina didn't help.
+
+Now it's August and we're going to have a whole week of weather like
+today's: In the upper 70's (aka mid 20's), breezy, beautiful puffy clouds.
+
+I'm still dreading the second half of the month though. ;-)
+
+[[tag lay]]

diff --git a/blog/about.mdwn b/blog/about.mdwn
index 8f166a7..42db6a9 100644
--- a/blog/about.mdwn
+++ b/blog/about.mdwn
@@ -7,7 +7,7 @@ Some of the more well known posts on my blog have included:
 * [[blog/entry/thread_patterns]]
 * [[blog/entry/d-i_retrospective]]
 * [[ten_years_of_free_software|blog/entry/ten_years_of_free_software_--_part_1_pdmenu]]
-* [[ending_the_tyranny_of_unix_permissions]]
+* [[blog/entry/ending_the_tyranny_of_unix_permissions]]
 
 Besides the main blog, some other feeds are available:
 

diff --git a/blog/entry/awesome.mdwn b/blog/entry/awesome.mdwn
index 39f2e8c..a7b1ab9 100644
--- a/blog/entry/awesome.mdwn
+++ b/blog/entry/awesome.mdwn
@@ -29,6 +29,6 @@ underlying philosopy of the window manager, and think up new ways of doing
 things, inspired by that philosopy, and modify the environment to allow
 doing those things.
 
-So ideally, "I switched to a new window manager" doesh't mean "my screen
+So ideally, "I switched to a new window manager" doesn't mean "my screen
 has some different widgets on it now". It means "I'm looking at the screen
 with new eyes."
diff --git a/blog/entry/life__44___day_11801.mdwn b/blog/entry/life__44___day_11801.mdwn
index d8980e8..d1b5f0e 100644
--- a/blog/entry/life__44___day_11801.mdwn
+++ b/blog/entry/life__44___day_11801.mdwn
@@ -12,4 +12,4 @@ combusion, please shoot me.)
 
 Another night on battery power @yurt.
 
-Now playing: Cidadas and The Who, loudly.
+Now playing: Cicadas and The Who, loudly.

diff --git a/blog/entry/life__44___day_11801.mdwn b/blog/entry/life__44___day_11801.mdwn
new file mode 100644
index 0000000..d8980e8
--- /dev/null
+++ b/blog/entry/life__44___day_11801.mdwn
@@ -0,0 +1,15 @@
+Spent the first half of the day working on a web inteface to configure
+ikiwiki. The next version of ikiwiki will have that and some other neat
+setup features that make it really easy to set up a wiki.
+
+Then up to Abingdon for VA highlands. I was actually reminded of Edinburgh,
+but not by the kilts and celtic music; instead by the post-rain damp and
+little alleys.
+
+Drove Anna's golf cart around the swamp. Suprisingly capable in mud and
+creek ford and general rough going. (PS, if my next car has internal
+combusion, please shoot me.)
+
+Another night on battery power @yurt.
+
+Now playing: Cidadas and The Who, loudly.

diff --git a/code/mr/news/version_0.29.mdwn b/code/mr/news/version_0.29.mdwn
deleted file mode 100644
index 6ae90a8..0000000
--- a/code/mr/news/version_0.29.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-mr 0.29 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Allow environment variables in section headers. Pass such headers
-     through the shell to expand them. Closes: #[480580](http://bugs.debian.org/480580)
-   * For the checkout command, MR\_REPO was set to the name of the parent
-     directory of the directory to checkout. It is supposed to be the
-     path to the directory itself though; fixed this. Closes: #[480424](http://bugs.debian.org/480424)"""]]
\ No newline at end of file
diff --git a/code/mr/news/version_0.34.mdwn b/code/mr/news/version_0.34.mdwn
new file mode 100644
index 0000000..bcd559f
--- /dev/null
+++ b/code/mr/news/version_0.34.mdwn
@@ -0,0 +1,3 @@
+mr 0.34 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix bug when remembering failed commands in offline mode."""]]
\ No newline at end of file

diff --git a/sandbox.mdwn b/sandbox.mdwn
index e8b6156..1cbadd0 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,11 +2,3 @@ Testing 1 2 3!!
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]
-
-[[toggle id="ipsum" text="show"]]
-[[toggleable id="ipsum" text="""
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-aliquip ex ea commodo consequat.
-"""]]

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index 529f1b0..0a5942f 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -1,2 +1,6 @@
 Thanks for etckeeper; I just used it in anger for the first time.  I don't know for a fact that it really made my life better, but it makes me _feel_ better.  The story: I applied the usual security upgrade to my desktop box, and after rebooting, noted with dismay that my monitor, which had previously been happily running at 1280x1024, was now running at 640x480.  (Typical Linux story.)  So I poked around, and dimly remembered that I could run 'dpkg-reconfigure xserver-xorg', which I did.  (I realize that's probably not the best tool for what I was doing, but it's all I remembered).  That worked -- the monitor is now back to its old 1280x1024 self.  Naturally the xorg.conf file is totally different; both the current version and the old version are utterly incomprehensible to me ... but the point is _I've got a record of all of them_, plus a comment explaining what I did and why.  _That's_ why etckeeper makes me feel better.
 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 ...

diff --git a/blog/entry/graphical_annotate/discussion.mdwn b/blog/entry/graphical_annotate/discussion.mdwn
new file mode 100644
index 0000000..9ce7941
--- /dev/null
+++ b/blog/entry/graphical_annotate/discussion.mdwn
@@ -0,0 +1 @@
+I really like http://meld.sourceforge.net/ when I need to diff unfamiliar material.  It doesn't really help much with half of your question, but you're clever, I bet you can figure the rest out.

diff --git a/blog/entry/oops__44___I_did_it_again.mdwn b/blog/entry/oops__44___I_did_it_again.mdwn
new file mode 100644
index 0000000..1cb77d7
--- /dev/null
+++ b/blog/entry/oops__44___I_did_it_again.mdwn
@@ -0,0 +1,3 @@
+So, the good news is that I'm the only one who will be flooding planet
+Debian by upgrading ikiwiki. Bad news of course is that I didn't notice the
+bug until I was testing the new release in my own blog. :-)

diff --git a/cvshome.mdwn b/cvshome.mdwn
index e3f87ac..eb358b8 100644
--- a/cvshome.mdwn
+++ b/cvshome.mdwn
@@ -1,7 +1,7 @@
 [[meta title="CVS homedir, or keeping your life in CVS"]]
 
 **This article is provided for historical reasons, but I use subversion
-now. [[Svnhome]] explains how.**
+(or newer stuff, like git) now. [[Svnhome]] explains how.**
 
 ----
 

diff --git a/blog/entry/never_thought_this_would_happen.mdwn b/blog/entry/never_thought_this_would_happen.mdwn
index 960f2ae..b58ad42 100644
--- a/blog/entry/never_thought_this_would_happen.mdwn
+++ b/blog/entry/never_thought_this_would_happen.mdwn
@@ -1,3 +1,3 @@
 I'm reading USENET again.
 
-<shock>
+`<shock>`

diff --git a/blog/entry/disturbing_thought.mdwn b/blog/entry/disturbing_thought.mdwn
new file mode 100644
index 0000000..9a2c1e5
--- /dev/null
+++ b/blog/entry/disturbing_thought.mdwn
@@ -0,0 +1,26 @@
+So for those of you who arn't aware, as of yesterday, it's easy for any
+spotty teenager/script kiddie to make you see content you didn't expect to
+when you go to google or your bank, etc. Maybe you're lucky and someone has
+fixed the problem on your network. Most likely you're
+[not so lucky](http://www.hackerfactor.com/blog/index.php?/archives/204-Poor-DNS.html).
+
+(Confidential to Anna, Maggie, Adrianne, Errol, Barbara, Mark: You're
+lucky! But only when you're at home.)
+
+At the moment, the idea that DNS can be trivially poisoned seems like a really
+serious problem.
+
+Will there come to be a point when we just regard this as "DNS spam",
+basically accepting that it's happening all the time, indeed that a given
+DNS query is as likely spoofed than good, and nothing can be trusted, or
+indeed, fixed? If you don't think this can happen to a internet techology,
+just look at the average inbox now, and compare it to the average inbox 
+circa 1993.
+
+I can't claim to be an expert in this area, but based on what I'm reading,
+the current "fix" increases the time-to-exploit from 11 seconds to maybe 1
+week. (BTW, is there a reason why DNS servers are caching in-baliwick
+responses.. would it work to entirely disable that caching? Any chance for
+a second round of more targeted fixes now that the cat is out of the bag?) 
+Also, I get the impression DNSSEC will never be successfully deployed, barring a
+miracle. And we seem to have just run out of miracles.

diff --git a/index.mdwn b/index.mdwn
index cfb5517..bd1a5e3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -20,5 +20,5 @@ Other stuff here includes:
 
 Up to [kite](http://kitenet.net).
 
-[[meta openid="http://joeyh.myopenid.com/"
+\[[meta openid="https://joeyh.myopenid.com/"
 server="http://www.myopenid.com/server"]]

diff --git a/code/mr/news/version_0.28.mdwn b/code/mr/news/version_0.28.mdwn
deleted file mode 100644
index 56c4004..0000000
--- a/code/mr/news/version_0.28.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-mr 0.28 released with [[toggle text="these changes"]]
-[[toggleable text="""
-   * Use debhelper v7, rules file minimisation.
-   * Add a Makefile."""]]
\ No newline at end of file
diff --git a/code/mr/news/version_0.33.mdwn b/code/mr/news/version_0.33.mdwn
new file mode 100644
index 0000000..ce93964
--- /dev/null
+++ b/code/mr/news/version_0.33.mdwn
@@ -0,0 +1,4 @@
+mr 0.33 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Add a push subcommand, which pushes committed changes for DCVS, and
+     does nothing for svn/cvs. Closes: #[491865](http://bugs.debian.org/491865)"""]]
\ No newline at end of file

diff --git a/code/mr.mdwn b/code/mr.mdwn
index 7393121..63d2c82 100644
--- a/code/mr.mdwn
+++ b/code/mr.mdwn
@@ -13,6 +13,8 @@ of things it can do include:
   and merge the two together.
 * Run several repository updates in parallel, greatly speeding up
   the update process.
+* Remember actions that failed due to a laptop being offline, so they
+  can be retried when it comes back online.
 
 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

diff --git a/code/pdmenu/news/version_1.2.95.mdwn b/code/pdmenu/news/version_1.2.95.mdwn
new file mode 100644
index 0000000..a4c0ea3
--- /dev/null
+++ b/code/pdmenu/news/version_1.2.95.mdwn
@@ -0,0 +1,5 @@
+pdmenu 1.2.95 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Actually enable Russian translation in Makefile.
+   * Put in a workaround for slang bug #407835. (If it is a bug.. workaround is
+     just to enable its OS-specific utf-8 sensing code.)"""]]
\ No newline at end of file

diff --git a/blog/entry/thought_for_the_day/discussion.mdwn b/blog/entry/thought_for_the_day/discussion.mdwn
new file mode 100644
index 0000000..e61c4c1
--- /dev/null
+++ b/blog/entry/thought_for_the_day/discussion.mdwn
@@ -0,0 +1 @@
+Check out [Jacques Pepin's Complete Techniques](http://www.librarything.com/work/book/24898608).  There are fun carving ideas in there...

diff --git a/blog/entry/thought_for_the_day.mdwn b/blog/entry/thought_for_the_day.mdwn
new file mode 100644
index 0000000..7b02d88
--- /dev/null
+++ b/blog/entry/thought_for_the_day.mdwn
@@ -0,0 +1,10 @@
+Nobody I know knows how to cut a watermelon.
+
+I've seen it done by experts once: A family attacked one, sitting on a
+picnic table. In their hands, it became a wholly different fruit than
+our [stodgy sliced seedless](http://www.wikihow.com/Cut-a-Watermelon).
+They had a small knife. Chainsaws would not have made it more exciting.
+
+I saw it done, but I don't know how.
+
+[[tag lay]]

diff --git a/code/pdmenu/news/version_1.2.94.mdwn b/code/pdmenu/news/version_1.2.94.mdwn
new file mode 100644
index 0000000..1244a6c
--- /dev/null
+++ b/code/pdmenu/news/version_1.2.94.mdwn
@@ -0,0 +1,4 @@
+pdmenu 1.2.94 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Added a Russian translation from Yuri Kozlov.
+     Closes: #[480646](http://bugs.debian.org/480646)"""]]
\ No newline at end of file

diff --git a/code/words2nums/news/version_0.17.mdwn b/code/words2nums/news/version_0.17.mdwn
new file mode 100644
index 0000000..7eef50c
--- /dev/null
+++ b/code/words2nums/news/version_0.17.mdwn
@@ -0,0 +1,3 @@
+liblingua-en-words2nums-perl 0.17 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Use debhelper v7; rules file minimisation."""]]
\ No newline at end of file

diff --git a/code/mr/news/version_0.27.mdwn b/code/mr/news/version_0.27.mdwn
deleted file mode 100644
index d835e22..0000000
--- a/code/mr/news/version_0.27.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-mr 0.27 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Ignore exit code from darcs whatsnew, which can be nonzero if there
-     are no changes. Closes: #[476650](http://bugs.debian.org/476650)"""]]
\ No newline at end of file
diff --git a/code/mr/news/version_0.32.mdwn b/code/mr/news/version_0.32.mdwn
new file mode 100644
index 0000000..154de28
--- /dev/null
+++ b/code/mr/news/version_0.32.mdwn
@@ -0,0 +1,3 @@
+mr 0.32 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Include the right (v2) version of GPL in the source."""]]
\ No newline at end of file

diff --git a/code/filters/news/version_2.40.mdwn b/code/filters/news/version_2.40.mdwn
deleted file mode 100644
index 38684f0..0000000
--- a/code/filters/news/version_2.40.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-filters 2.40 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Update url to web page in README.
-   * Add scottish filter by Adam Borowski. Closes: #[436168](http://bugs.debian.org/436168)"""]]
\ No newline at end of file
diff --git a/code/filters/news/version_2.45.mdwn b/code/filters/news/version_2.45.mdwn
new file mode 100644
index 0000000..25bf691
--- /dev/null
+++ b/code/filters/news/version_2.45.mdwn
@@ -0,0 +1,3 @@
+filters 2.45 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Use debhelper v7; rules file minimisation to 3 lines."""]]
\ No newline at end of file

diff --git a/code/wmbattery/news/version_2.34.mdwn b/code/wmbattery/news/version_2.34.mdwn
deleted file mode 100644
index fd5eef3..0000000
--- a/code/wmbattery/news/version_2.34.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-wmbattery 2.34 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * Bit the bullet, stopped trying to track the kernel's ever changing
-     interfaces, and added support for querying battery information from hal.
-     Support for the old kernel interfaces (APM, ACPI, etc) is still present,
-     but to use new interfaces such 2.6.24's /sys/class/power\_adapter, you'll
-     have to have dbus and hal.
-     Closes: #[456247](http://bugs.debian.org/456247), #[246641](http://bugs.debian.org/246641), #[290712](http://bugs.debian.org/290712), #[393616](http://bugs.debian.org/393616), #[456248](http://bugs.debian.org/456248)
-   * Fix -e option."""]]
\ No newline at end of file
diff --git a/code/wmbattery/news/version_2.39.mdwn b/code/wmbattery/news/version_2.39.mdwn
new file mode 100644
index 0000000..833e548
--- /dev/null
+++ b/code/wmbattery/news/version_2.39.mdwn
@@ -0,0 +1,5 @@
+wmbattery 2.39 released with [[!toggle text="these changes"]]
+\[[!toggleable text="""
+   * Use debhelper v7; rules file minimisation.
+   * Depend on hal since /proc/acpi is gone from the default kernels now.
+     Closes: #[491099](http://bugs.debian.org/491099)"""]]
\ No newline at end of file

diff --git a/blog/entry/graphical_annotate.mdwn b/blog/entry/graphical_annotate.mdwn
index 95a7ccf..45c24da 100644
--- a/blog/entry/graphical_annotate.mdwn
+++ b/blog/entry/graphical_annotate.mdwn
@@ -20,4 +20,9 @@ block centered in the display as lines are added/removed from the file,
 adjusting scroll bar position to compensate.
 
 There seems to be a `gannotate` for `bzr`, that may do something like this.
-Offline so I can't try it.
+Offline so I can't try it. 
+
+Google-and-caffine-fed update: bzr gannotate is closest to what I envisoned,
+though without a few of the bonuses (fade-out, smart scrolling, multiple
+files). qgit's "tree view" includes the same functionality, but the interface
+isn't as nice.
diff --git a/boxen.mdwn b/boxen.mdwn
index 593bc38..60e678f 100644
--- a/boxen.mdwn
+++ b/boxen.mdwn
@@ -13,7 +13,8 @@ Mostly mythical creatures.
 * [[kodama]] {*}
 * kraken
 * [[dragon]] {*}
-* grebe {*} (Anna's)
+* corvid {*} (Anna's)
+* grebe {*} (Anna's old laptop)
 * [[phoenix]] {*} (Maggie's)
 
 ## servers

diff --git a/blog/entry/graphical_annotate.mdwn b/blog/entry/graphical_annotate.mdwn
new file mode 100644
index 0000000..95a7ccf
--- /dev/null
+++ b/blog/entry/graphical_annotate.mdwn
@@ -0,0 +1,23 @@
+I'm envisioning a graphical app that displays a file. Like a pager, the up
+and down arrows move through the file. But the left and right arrows move
+through time. As each successive change to the file is displayed, the
+committer's name appears in a column to the left of the lines changed in
+that commit. Hover the mouse over it to see the commit message. Names of
+old committers will fade out as time advances, but still be visible
+for a while. (A menu option will disable the fade out entirely.)
+
+A nice bonus feature would be to allow opening multiple windows, with
+multiple files from the same repo. Moving back and forward in time would
+affect them all at once.
+
+A nice, but getting harder feature would be to have a horizontal timeline
+at the bottom, including branches, so you could click on a specific branch
+to visit it. (Without this, when passing a fork or merge point, it would
+have to choose a branch heuristically?)
+
+A tricky subtle feature would be to attempt to keep the current code
+block centered in the display as lines are added/removed from the file,
+adjusting scroll bar position to compensate.
+
+There seems to be a `gannotate` for `bzr`, that may do something like this.
+Offline so I can't try it.

diff --git a/blog/entry/good_long_day.mdwn b/blog/entry/good_long_day.mdwn
new file mode 100644
index 0000000..a01e876
--- /dev/null
+++ b/blog/entry/good_long_day.mdwn
@@ -0,0 +1,6 @@
+Went swimming in the Clinch river (the real one) @ the River Farm. Failed
+to find sinking creek's spring. Installed debian on Anna's new laptop,
+which went swimmingly though the wireless is a bit odd. Best pasta in
+recent memory. In bed @ Yurt.
+
+[[tag lay]]

diff --git a/code/debhelper/news/version_7.0.11.mdwn b/code/debhelper/news/version_7.0.11.mdwn
deleted file mode 100644
index 61a2261..0000000
--- a/code/debhelper/news/version_7.0.11.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-debhelper 7.0.11 released with [[toggle text="these changes"]]
-\[[toggleable text="""
-   * dh: Man page fix. Closes: #[485116](http://bugs.debian.org/485116)
-   * Add stamp files to example rules targets. Closes: #[486327](http://bugs.debian.org/486327)
-   * Add a build dependency on file. The rules file now runs dh\_strip and
-     dh\_shlibdeps, which both use it. (It could be changed not to, but
-     it's good to have it run all the commands as a test.) Closes: #[486439](http://bugs.debian.org/486439)
-   * Typo fix. Closes: #[486464](http://bugs.debian.org/486464)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.0.16.mdwn b/code/debhelper/news/version_7.0.16.mdwn
new file mode 100644
index 0000000..bdfd2ba
--- /dev/null
+++ b/code/debhelper/news/version_7.0.16.mdwn
@@ -0,0 +1,5 @@
+debhelper 7.0.16 released with [[toggle text="these changes"]]
+\[[toggleable text="""
+   * dh: Avoid passing --with on to subcommands. Closes: #[490886](http://bugs.debian.org/490886)
+   * dh\_installchangelogs: When searching for changelog in v7 mode, skip
+     empty files. Closes: #[490937](http://bugs.debian.org/490937)"""]]
\ No newline at end of file

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index d6de085..529f1b0 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -1 +1,2 @@
-Sounds groovy!  Trying it now.
+Thanks for etckeeper; I just used it in anger for the first time.  I don't know for a fact that it really made my life better, but it makes me _feel_ better.  The story: I applied the usual security upgrade to my desktop box, and after rebooting, noted with dismay that my monitor, which had previously been happily running at 1280x1024, was now running at 640x480.  (Typical Linux story.)  So I poked around, and dimly remembered that I could run 'dpkg-reconfigure xserver-xorg', which I did.  (I realize that's probably not the best tool for what I was doing, but it's all I remembered).  That worked -- the monitor is now back to its old 1280x1024 self.  Naturally the xorg.conf file is totally different; both the current version and the old version are utterly incomprehensible to me ... but the point is _I've got a record of all of them_, plus a comment explaining what I did and why.  _That's_ why etckeeper makes me feel better.
+Thanks again.

diff --git a/blog/entry/awesome/discussion.mdwn b/blog/entry/awesome/discussion.mdwn
index 36fd836..91fda1e 100644
--- a/blog/entry/awesome/discussion.mdwn
+++ b/blog/entry/awesome/discussion.mdwn
@@ -10,7 +10,9 @@ Well that is why I did not switch to awesome yet: I do not find a clean way to b
 
 ---
 
-I've never had a window that shape...  It'd be damned hard to frame.  Looks more like a flag in four quarters.  But yes, that's my (not Mr. Hess's) Mod4.  I think it's normally Super_L, but I remapped it with xmodmap.  My ~/.xmodmaprc:
+I've never had a window that shape...  It'd be damned hard to frame.  Looks more like a flag in four quarters.  But yes, that's my (not Mr. Hess's) Mod4.  I think it's normally `Super_L`, but I remapped it with xmodmap.  My ~/.xmodmaprc:
+
     clear Mod4
     add Mod4 = Super_L
+
 Then I had to copy the .awesomerc from its origins, etc.  I'm not a huge fan of awesome; I just don't have time to play with StumpWM or any of the others to get multihead working sanely right now.

diff --git a/blog/entry/awesome/discussion.mdwn b/blog/entry/awesome/discussion.mdwn
index eda0341..36fd836 100644
--- a/blog/entry/awesome/discussion.mdwn
+++ b/blog/entry/awesome/discussion.mdwn
@@ -8,3 +8,9 @@ You can configure awesome to use that key with the funny wiggly box shape (Mod4
 
 Well that is why I did not switch to awesome yet: I do not find a clean way to bind Mod4 to one of my laptop key (Apple MacBook Pro). What is your Mod key binded to ? Windows key ?
 
+---
+
+I've never had a window that shape...  It'd be damned hard to frame.  Looks more like a flag in four quarters.  But yes, that's my (not Mr. Hess's) Mod4.  I think it's normally Super_L, but I remapped it with xmodmap.  My ~/.xmodmaprc:
+    clear Mod4
+    add Mod4 = Super_L
+Then I had to copy the .awesomerc from its origins, etc.  I'm not a huge fan of awesome; I just don't have time to play with StumpWM or any of the others to get multihead working sanely right now.

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5ac6133..e8b6156 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3!
+Testing 1 2 3!!
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5f7b08b..5ac6133 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3
+Testing 1 2 3!
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5ac6133..5f7b08b 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3!
+Testing 1 2 3
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index fafb0a8..5ac6133 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3 4!
+Testing 1 2 3!
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5900001..fafb0a8 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3 4
+Testing 1 2 3 4!
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5f7b08b..5900001 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3
+Testing 1 2 3 4
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5900001..5f7b08b 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3 4
+Testing 1 2 3
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5f7b08b..5900001 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3
+Testing 1 2 3 4
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5900001..5f7b08b 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
-Testing 1 2 3 4
+Testing 1 2 3
 
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 44b3c8a..5900001 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -3,9 +3,6 @@ Testing 1 2 3 4
 [[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]
 
-[[blog]]
-
-
 [[toggle id="ipsum" text="show"]]
 \[[toggleable id="ipsum" text="""
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do

diff --git a/smileys.mdwn b/smileys.mdwn
index ebafe95..d6d675c 100644
--- a/smileys.mdwn
+++ b/smileys.mdwn
@@ -5,12 +5,12 @@ I'm too serious to use smileys (also, I tend to end parenthasized blocks with th
 This page is used to control what smileys are supported by the wiki.
 Just write the text of a smiley to display it.
 
-* \{OK}	[[smileys/thumbs-up.png]]
-* \{X}	[[smileys/icon-error.png]]
-* \(./)	[[smileys/checkmark.png]]
-* \/!\	[[smileys/alert.png]]
-* \{*}	[[smileys/star_on.png]]
-* \{o}	[[smileys/star_off.png]]
+* \\{OK}	[[smileys/thumbs-up.png]]
+* \\{X}	[[smileys/icon-error.png]]
+* \\(./)	[[smileys/checkmark.png]]
+* \\/!\	[[smileys/alert.png]]
+* \\{*}	[[smileys/star_on.png]]
+* \\{o}	[[smileys/star_off.png]]
 
 ----
 

diff --git a/blog/entry/awesome/discussion.mdwn b/blog/entry/awesome/discussion.mdwn
index 097a4a4..eda0341 100644
--- a/blog/entry/awesome/discussion.mdwn
+++ b/blog/entry/awesome/discussion.mdwn
@@ -1,3 +1,10 @@
 The first thing I want to know about a window manager is the same thing I want to know about a terminal emulator: does it steal my keystrokes, thus making it hard to use Emacs?  If so, it's a deal-breaker.  Metacity is decent, since even though it does by default steal a bunch, it's pretty easy to tell it not to.
+
 ---
+
 You can configure awesome to use that key with the funny wiggly box shape (Mod4 for me) as its escape key, leaving everything else open to applications.  And it's the only one of the wmii/dwm/awesome family that seems to cope with dynamic multiple monitors.  I prefer wmii's column-based layout, but the XRandR support sucks.  And if I'm going to hack the code as in dwm, I'll switch to StumpWM or XMonad first.
+
+---
+
+Well that is why I did not switch to awesome yet: I do not find a clean way to bind Mod4 to one of my laptop key (Apple MacBook Pro). What is your Mod key binded to ? Windows key ?
+

diff --git a/blog/entry/awesome/discussion.mdwn b/blog/entry/awesome/discussion.mdwn
index b5efa29..097a4a4 100644
--- a/blog/entry/awesome/discussion.mdwn
+++ b/blog/entry/awesome/discussion.mdwn
@@ -1 +1,3 @@
 The first thing I want to know about a window manager is the same thing I want to know about a terminal emulator: does it steal my keystrokes, thus making it hard to use Emacs?  If so, it's a deal-breaker.  Metacity is decent, since even though it does by default steal a bunch, it's pretty easy to tell it not to.